Build: PXA: Fix TrizepsIV build variants
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
diff --git a/MAKEALL b/MAKEALL
index 5eb8570..51312dd 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -468,10 +468,7 @@
## 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 @@
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_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 9717ed3..3960bef 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -63,6 +63,8 @@
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