[U-Boot] [PATCH 2/2] Build: PXA: Fix TrizepsIV build variants

Marek Vasut marek.vasut at gmail.com
Tue Oct 19 22:25:17 CEST 2010


Signed-off-by: Marek Vasut <marek.vasut at gmail.com>
---
 MAKEALL                 |    5 +----
 Makefile                |    8 --------
 board/trizepsiv/conxs.c |    2 +-
 boards.cfg              |    2 ++
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index 59ff847..1a96b0f 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -336,10 +336,7 @@ LIST_at91="			\
 ## Xscale Systems
 #########################################################################
 
-LIST_pxa="$(boards_by_cpu pxa)
-	polaris		\
-	trizepsiv	\
-"
+LIST_pxa="$(boards_by_cpu pxa)"
 
 LIST_ixp="$(boards_by_cpu ixp)
 	pdnb3		\
diff --git a/Makefile b/Makefile
index 8078d71..9dcd59d 100644
--- a/Makefile
+++ b/Makefile
@@ -1010,14 +1010,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 b8365f7..97b5343 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -62,6 +62,8 @@ lubbock		arm	pxa
 palmld		arm	pxa
 palmtc		arm	pxa
 pleb2		arm	pxa
+polaris		arm	pxa		trizepsiv	-		-		trizepsiv:POLARIS
+trizepsiv	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
-- 
1.7.1



More information about the U-Boot mailing list