summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2010-10-03 18:27:36 +0200
committerWolfgang Denk <wd@denx.de>2010-10-19 23:05:15 +0200
commitf97e9c65b3906cd656c14ed0fd35eae0c1649857 (patch)
tree1f2369cf306fcb0155dafe4c6e751818102e6f89 /include/configs
parent451a0c39ae8553cb7f1ae3385211c0c17d391465 (diff)
Build: PXA: Fix Vpac270 build variants
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/vpac270.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index fc680fcd83..c9d9c69cda 100644
--- a/include/configs/vpac270.h
+++ b/include/configs/vpac270.h
@@ -75,7 +75,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
@@ -165,13 +165,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 */
@@ -198,7 +198,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
@@ -206,7 +206,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
@@ -308,7 +308,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