Signed-off-by: Marek Vasut <marek.va...@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
+trizep...@polaris arm pxa
+trizepsiv arm pxa
vpac...@nor@128M arm pxa
vpac...@nor@256M arm pxa
vpac...@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
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
