diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2010-10-04 00:21:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-19 23:05:19 +0200 |
| commit | 7c957c0e7427e8bc1039e39850de1fead26b3c53 (patch) | |
| tree | 901d4cc5a31cd342f72f928dca361831ba49ac05 | |
| parent | f97e9c65b3906cd656c14ed0fd35eae0c1649857 (diff) | |
| download | talos-obmc-uboot-7c957c0e7427e8bc1039e39850de1fead26b3c53.tar.gz talos-obmc-uboot-7c957c0e7427e8bc1039e39850de1fead26b3c53.zip | |
Build: PXA: Fix TrizepsIV build variants
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
| -rwxr-xr-x | MAKEALL | 5 | ||||
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | board/trizepsiv/conxs.c | 2 | ||||
| -rw-r--r-- | boards.cfg | 2 |
4 files changed, 4 insertions, 13 deletions
@@ -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 \ @@ -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 |
