summaryrefslogtreecommitdiff
path: root/include/configs/vpac270.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-11-12 22:24:06 +0100
committerWolfgang Denk <wd@denx.de>2010-11-12 22:24:06 +0100
commitd963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0 (patch)
tree07dd5889d73f4b66ad608815adcf6f2f953d9501 /include/configs/vpac270.h
parent66fca016057b1c6b697552cc7220ebada9d4f82d (diff)
parent0c0892be0d93a5a892b93739c5eb3bf692fed4ff (diff)
downloadu-boot-d963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0.tar.gz
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'include/configs/vpac270.h')
-rw-r--r--include/configs/vpac270.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index c9d9c69cda..35afcd356c 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -27,13 +27,13 @@
*/
#define CONFIG_PXA27X 1 /* Marvell PXA270 CPU */
#define CONFIG_VPAC270 1 /* Voipac PXA270 board */
+#define CONFIG_SYS_TEXT_BASE 0x0
/*
* Environment settings
*/
#define CONFIG_ENV_OVERWRITE
#define CONFIG_SYS_MALLOC_LEN (128*1024)
-#define CONFIG_SYS_GBL_DATA_SIZE 128
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_BOOTCOMMAND \
"if mmc init && fatload mmc 0 0xa4000000 uImage; then " \
@@ -184,7 +184,7 @@
#define CONFIG_SYS_IPL_LOAD_ADDR (0x5c000000)
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_SP_ADDR \
- (PHYS_SDRAM_1 + CONFIG_SYS_GBL_DATA_SIZE + 2048)
+ (PHYS_SDRAM_1 + GENERATED_GBL_DATA_SIZE + 2048)
/*
* NOR FLASH