katmai: fix section overlap problem

Since we didn't want to remove features from the configuration, we
decided to increase the U-Boot image size (add one flash sector).

Also changed the default environment definition to make it
independent of such changes.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Acked-by: Stefan Roese <sr@denx.de>

diff --git a/board/amcc/katmai/config.mk b/board/amcc/katmai/config.mk
index 115c1aed05314a3e72e21b6c8ca1d10fd6ca391c..c512b53c6f3409de48780a3be6b1cf90da380bc1 100644 (file)
--- a/board/amcc/katmai/config.mk
+++ b/board/amcc/katmai/config.mk
@@ -25,7 +25,7 @@
 # AMCC 440SPe Evaluation (Katmai) board
 #
 
-TEXT_BASE = 0xfffc0000
+TEXT_BASE = 0xFFFA0000
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 

diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 21b26044a547bd48341ddf4cc0bdbc915c6f6909..122b7006e1dae85671ee69d1d2fd88f70c0a2ff9 100644 (file)
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -178,6 +178,9 @@
 
 #undef CONFIG_BOOTARGS
 
+#define xstr(s) str(s)
+#define str(s) #s
+
 #define        CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "hostname=katmai\0"                                             \
@@ -206,8 +209,9 @@
        "ramdisk_addr=fff20000\0"                                       \
        "initrd_high=30000000\0"                                        \
        "load=tftp 200000 katmai/u-boot.bin\0"                          \
-       "update=protect off fffc0000 ffffffff;era fffc0000 ffffffff;"   \
-               "cp.b ${fileaddr} fffc0000 ${filesize};"                \
+       "update=protect off " xstr(CFG_MONITOR_BASE) " FFFFFFFF;"       \
+               "era " xstr(CFG_MONITOR_BASE) " FFFFFFFF;"              \
+               "cp.b ${fileaddr} " xstr(CFG_MONITOR_BASE) " ${filesize};" \
                "setenv filesize;saveenv\0"                             \
        "upd=run load update\0"                                         \
        "kozio=bootm ffc60000\0"                                        \