X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fvpac270.h;h=9db4d999b713fe206f5087aea92a158a2fa364b8;hb=2f83cd57b67504f0c254f31862dfcc9baf791a3a;hp=1923a177a11adaf4765fad3a20e88c6d51ff8208;hpb=720a650caa510bf8e941f8da247fc572958f3c3d;p=u-boot

diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 1923a177a1..9db4d999b7 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 "		\
@@ -51,7 +51,6 @@
 #define	CONFIG_BOOTDELAY		2	/* Autoboot delay */
 #define	CONFIG_CMDLINE_TAG
 #define	CONFIG_SETUP_MEMORY_TAGS
-#define	CONFIG_SYS_TEXT_BASE		0x0
 #define	CONFIG_LZMA			/* LZMA compression support */
 
 /*
@@ -75,7 +74,7 @@
 #undef	CONFIG_LCD
 #define	CONFIG_CMD_IDE
 
-#ifdef	CONFIG_ONENAND_U_BOOT
+#ifdef	CONFIG_ONENAND
 #undef	CONFIG_CMD_FLASH
 #define	CONFIG_CMD_ONENAND
 #else
@@ -91,7 +90,6 @@
 #define	CONFIG_CMD_PING
 #define	CONFIG_CMD_DHCP
 
-#define	CONFIG_NET_MULTI		1
 #define	CONFIG_DRIVER_DM9000		1
 #define	CONFIG_DM9000_BASE		0x08000300	/* CS2 */
 #define	DM9000_IO			(CONFIG_DM9000_BASE)
@@ -165,13 +163,13 @@
 #define	PHYS_SDRAM_1			0xa0000000	/* SDRAM Bank #1 */
 #define	PHYS_SDRAM_1_SIZE		0x08000000	/* 128 MB */
 
-#ifdef	CONFIG_256M_U_BOOT
+#ifdef	CONFIG_RAM_256M
 #define	PHYS_SDRAM_2			0x80000000	/* SDRAM Bank #2 */
 #define	PHYS_SDRAM_2_SIZE		0x08000000	/* 128 MB */
 #endif
 
 #define	CONFIG_SYS_DRAM_BASE		0xa0000000	/* CS0 */
-#ifdef	CONFIG_256M_U_BOOT
+#ifdef	CONFIG_RAM_256M
 #define	CONFIG_SYS_DRAM_SIZE		0x10000000	/* 256 MB DRAM */
 #else
 #define	CONFIG_SYS_DRAM_SIZE		0x08000000	/* 128 MB DRAM */
@@ -180,10 +178,11 @@
 #define	CONFIG_SYS_MEMTEST_START	0xa0400000	/* memtest works on */
 #define	CONFIG_SYS_MEMTEST_END		0xa0800000	/* 4 ... 8 MB in DRAM */
 
-#define	CONFIG_SYS_LOAD_ADDR		(0x5c000000)
+#define	CONFIG_SYS_LOAD_ADDR		PHYS_SDRAM_1
+#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
@@ -197,7 +196,7 @@
 #if	defined(CONFIG_CMD_FLASH)	/* NOR */
 #define	PHYS_FLASH_1			0x00000000	/* Flash Bank #1 */
 
-#ifdef	CONFIG_256M_U_BOOT
+#ifdef	CONFIG_RAM_256M
 #define	PHYS_FLASH_2			0x02000000	/* Flash Bank #2 */
 #endif
 
@@ -205,7 +204,7 @@
 #define	CONFIG_FLASH_CFI_DRIVER		1
 
 #define	CONFIG_SYS_MAX_FLASH_SECT	(4 + 255)
-#ifdef	CONFIG_256M_U_BOOT
+#ifdef	CONFIG_RAM_256M
 #define	CONFIG_SYS_MAX_FLASH_BANKS	2
 #define	CONFIG_SYS_FLASH_BANKS_LIST	{ PHYS_FLASH_1, PHYS_FLASH_2 }
 #else
@@ -307,7 +306,7 @@
 #define	CONFIG_SYS_MSC0_VAL	0x3ffc95fa
 #define	CONFIG_SYS_MSC1_VAL	0x02ccf974
 #define	CONFIG_SYS_MSC2_VAL	0x00000000
-#ifdef	CONFIG_256M_U_BOOT
+#ifdef	CONFIG_RAM_256M
 #define	CONFIG_SYS_MDCNFG_VAL	0x8ad30ad3
 #else
 #define	CONFIG_SYS_MDCNFG_VAL	0x88000ad3