From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/3] Build: PXA: Fix Vpac270 build variants
Date: Sun, 3 Oct 2010 18:34:33 +0200 [thread overview]
Message-ID: <1286123674-13461-2-git-send-email-marek.vasut@gmail.com> (raw)
In-Reply-To: <1286123674-13461-1-git-send-email-marek.vasut@gmail.com>
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
Makefile | 16 ----------------
board/vpac270/vpac270.c | 2 +-
boards.cfg | 3 +++
include/configs/vpac270.h | 12 ++++++------
4 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
index 929ae78..59067ee 100644
--- a/Makefile
+++ b/Makefile
@@ -2187,22 +2187,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..0baa8e4 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_MK_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 96c8890..93ee5ba 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -65,6 +65,9 @@ lubbock arm pxa
palmld arm pxa
palmtc arm pxa
pleb2 arm pxa
+vpac270 at NOR@128M arm pxa
+vpac270 at NOR@256M arm pxa
+vpac270 at OND@256M arm pxa
xaeniax arm pxa
xm250 arm pxa
zipitz2 arm pxa
diff --git a/include/configs/vpac270.h b/include/configs/vpac270.h
index 0bb0db4..399040c 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_MK_OND
#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_MK_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_MK_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_MK_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_MK_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_MK_256M
#define CONFIG_SYS_MDCNFG_VAL 0x8ad30ad3
#else
#define CONFIG_SYS_MDCNFG_VAL 0x88000ad3
--
1.7.1
next prev parent reply other threads:[~2010-10-03 16:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-03 16:34 [U-Boot] [PATCH 1/3] Build: Implement sentinel to pass board options Marek Vasut
2010-10-03 16:34 ` Marek Vasut [this message]
2010-10-03 20:27 ` [U-Boot] [PATCH 2/3] Build: PXA: Fix Vpac270 build variants Wolfgang Denk
2010-10-03 16:34 ` [U-Boot] [PATCH 3/3] Build: PXA: Fix TrizepsIV " Marek Vasut
2010-10-03 16:38 ` Marek Vasut
2010-10-03 20:28 ` Wolfgang Denk
2010-10-03 20:26 ` [U-Boot] [PATCH 1/3] Build: Implement sentinel to pass board options Wolfgang Denk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1286123674-13461-2-git-send-email-marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox