Signed-off-by: Marek Vasut <marek.va...@gmail.com>
---
MAKEALL | 3 ---
Makefile | 16 ----------------
board/vpac270/vpac270.c | 2 +-
boards.cfg | 3 +++
include/configs/vpac270.h | 12 ++++++------
5 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/MAKEALL b/MAKEALL
index 6c71943..59ff847 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -339,9 +339,6 @@ LIST_at91=" \
LIST_pxa="$(boards_by_cpu pxa)
polaris \
trizepsiv \
- vpac270_nor_128M\
- vpac270_nor_256M\
- vpac270_onenand \
"
LIST_ixp="$(boards_by_cpu ixp)
diff --git a/Makefile b/Makefile
index 25e8fc8..8078d71 100644
--- a/Makefile
+++ b/Makefile
@@ -1018,22 +1018,6 @@ trizepsiv_config : unconfig
fi;
@$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv
-vpac270_nor_256M_config \
-vpac270_nor_128M_config \
-vpac270_onenand_config : unconfig
- @mkdir -p $(obj)include
- @if [ "$(findstring onenand,$@)" ] ; then \
- echo "#define CONFIG_ONENAND_U_BOOT" \
- >>$(obj)include/config.h ; \
- echo "#define CONFIG_256M_U_BOOT" \
- >>$(obj)include/config.h ; \
- fi;
- @if [ "$(findstring 256M,$@)" ] ; then \
- echo "#define CONFIG_256M_U_BOOT" \
- >>$(obj)include/config.h ; \
- fi;
- @$(MKCONFIG) -n $@ -a vpac270 arm pxa vpac270
-
#########################################################################
## ARM1136 Systems
#########################################################################
diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c
index 91d8580..43bbdff 100644
--- a/board/vpac270/vpac270.c
+++ b/board/vpac270/vpac270.c
@@ -66,7 +66,7 @@ void dram_init_banksize(void)
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-#ifdef CONFIG_256M_U_BOOT
+#ifdef CONFIG_RAM_256M
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
#endif
diff --git a/boards.cfg b/boards.cfg
index 5d43f3d..b8365f7 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -62,6 +62,9 @@ lubbock arm pxa
palmld arm pxa
palmtc arm pxa
pleb2 arm pxa
+vpac270_nor_128 arm pxa vpac270 -
- vpac270:NOR,RAM_128M
+vpac270_nor_256 arm pxa vpac270 -
- vpac270:NOR,RAM_256M
+vpac270_ond_256 arm pxa vpac270 -
- vpac270:ONENAND,RAM_256M
xaeniax arm pxa
xm250 arm pxa
zipitz2 arm pxa
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index fc680fc..c9d9c69 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
--
1.7.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
