From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/3] Build: PXA: Fix TrizepsIV build variants
Date: Sun, 3 Oct 2010 18:34:34 +0200 [thread overview]
Message-ID: <1286123674-13461-3-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 | 8 --------
board/trizepsiv/conxs.c | 2 +-
boards.cfg | 2 ++
include/configs/trizepsiv.h | 6 +++---
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 59067ee..051b66b 100644
--- a/Makefile
+++ b/Makefile
@@ -2179,14 +2179,6 @@ scpu_config: unconfig
fi
@$(MKCONFIG) -n $@ -a pdnb3 arm ixp pdnb3 prodrive
-polaris_config \
-trizepsiv_config : unconfig
- @mkdir -p $(obj)include
- @if [ "$(findstring polaris,$@)" ] ; then \
- echo "#define CONFIG_POLARIS 1" >>$(obj)include/config.h ; \
- fi;
- @$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv
-
#########################################################################
## ARM1136 Systems
#########################################################################
diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c
index 7fac73d..0c67367 100644
--- a/board/trizepsiv/conxs.c
+++ b/board/trizepsiv/conxs.c
@@ -45,7 +45,7 @@ extern struct serial_device serial_ffuart_device;
extern struct serial_device serial_btuart_device;
extern struct serial_device serial_stuart_device;
-#if CONFIG_POLARIS
+#if CONFIG_MK_POLARIS
#define BOOT_CONSOLE "serial_stuart"
#else
#define BOOT_CONSOLE "serial_ffuart"
diff --git a/boards.cfg b/boards.cfg
index 93ee5ba..25b4554 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -65,6 +65,8 @@ lubbock arm pxa
palmld arm pxa
palmtc arm pxa
pleb2 arm pxa
+trizepsiv at POLARIS arm pxa
+trizepsiv arm pxa
vpac270 at NOR@128M arm pxa
vpac270 at NOR@256M arm pxa
vpac270 at OND@256M arm pxa
diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 4743495..8370274 100644
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -246,7 +246,7 @@
#define CONFIG_SYS_GFER1_VAL 0x00000000
#define CONFIG_SYS_GFER3_VAL 0x00000020
-#if CONFIG_POLARIS
+#if CONFIG_MK_POLARIS
#define CONFIG_SYS_GFER0_VAL 0x00000001
#define CONFIG_SYS_GFER2_VAL 0x00200000
#else
@@ -268,7 +268,7 @@
#define CONFIG_SYS_MSC0_VAL 0x4df84df0
#define CONFIG_SYS_MSC1_VAL 0x7ff87ff4
-#if CONFIG_POLARIS
+#if CONFIG_MK_POLARIS
#define CONFIG_SYS_MSC2_VAL 0xa2697ff8
#else
#define CONFIG_SYS_MSC2_VAL 0xa26936d4
@@ -294,7 +294,7 @@
#define CONFIG_NET_MULTI 1
#define CONFIG_DRIVER_DM9000 1
-#if CONFIG_POLARIS
+#if CONFIG_MK_POLARIS
#define CONFIG_DM9000_BASE 0x0C800000
#else
#define CONFIG_DM9000_BASE 0x08000000
--
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 ` [U-Boot] [PATCH 2/3] Build: PXA: Fix Vpac270 build variants Marek Vasut
2010-10-03 20:27 ` Wolfgang Denk
2010-10-03 16:34 ` Marek Vasut [this message]
2010-10-03 16:38 ` [U-Boot] [PATCH 3/3] Build: PXA: Fix TrizepsIV " 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-3-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