From 7c957c0e7427e8bc1039e39850de1fead26b3c53 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut@gmail.com>
Date: Mon, 4 Oct 2010 00:21:51 +0200
Subject: [PATCH] Build: PXA: Fix TrizepsIV build variants

Signed-off-by: Marek Vasut <marek.vasut@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 5eb857082c..51312dd5e3 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -468,10 +468,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 8078d71d93..9dcd59ddb9 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 7fac73d239..0c67367a5f 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 9717ed32b7..3960beff41 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -63,6 +63,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
-- 
2.39.5