Build: PXA: Fix TrizepsIV build variants

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>

diff --git a/MAKEALL b/MAKEALL
index 5eb857082c70127f5e219558289b89ac4fee9f46..51312dd5e3c87b0d0f0cb49feb00cfcd087f1fdf 100755 (executable)
--- 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 8078d71d93ad2d062431c3d3307f88ae7f7f3715..9dcd59ddb900fa4d9c38bc0b90c92a298708e73d 100644 (file)
--- 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 7fac73d2395fc8fcefada3a73c014b52dc326da7..0c67367a5fc93de12a0fa816a9d41c9429116557 100644 (file)
--- 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 9717ed32b7038a942b26fe2029270c09fbc9b8e7..3960beff41502aa36d5ea5991ec01928851fee8e 100644 (file)
--- 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