summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-04-28 10:55:24 +0200
committerWolfgang Denk <wd@denx.de>2008-04-28 11:10:12 +0200
commit144eec777ac07bcb12bd38245a5a289f694a7f98 (patch)
tree628ee5a1655b35a6791c8baef1da0676d2e447a2
parent03c6cd39f9184143fd8c537872b3d4b2e03f1466 (diff)
downloadu-boot-imx-144eec777ac07bcb12bd38245a5a289f694a7f98.zip
u-boot-imx-144eec777ac07bcb12bd38245a5a289f694a7f98.tar.gz
u-boot-imx-144eec777ac07bcb12bd38245a5a289f694a7f98.tar.bz2
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>
-rw-r--r--board/amcc/katmai/config.mk2
-rw-r--r--include/configs/katmai.h8
2 files changed, 7 insertions, 3 deletions
diff --git a/board/amcc/katmai/config.mk b/board/amcc/katmai/config.mk
index 115c1ae..c512b53 100644
--- 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 21b2604..122b700 100644
--- 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" \