powerpc/83xx/km: cleanup tuxx1 support

This is a preparation for the upcoming kmopti2 board. This board has
also a second fpga on board which is different to the tuxx1 target. But we
want to use the same header file. So remove the config option
KM_DISABLE_APP2 and simply use the board names to distinguish the features.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>

diff --git a/boards.cfg b/boards.cfg
index b1319aace0f8987ef3fe50f0e31f18d457c34c37..c1ed138b3c92c1c16dfac7daf6a7ed8cd2e47a06 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -705,9 +705,9 @@ SIMPC8313_SP                 powerpc     mpc83xx     simpc8313           sheldon
 TQM834x                      powerpc     mpc83xx     tqm834x             tqc
 suvd3                        powerpc     mpc83xx     km83xx              keymile        -           suvd3:SUVD3
 kmvect1                      powerpc     mpc83xx     km83xx              keymile        -           suvd3:KMVECT1
-tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,TUGE1
-tuxx1                        powerpc     mpc83xx     km83xx              keymile
-kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KM_DISABLE_APP2,KMSUPX5
+tuge1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:TUGE1
+tuxx1                        powerpc     mpc83xx     km83xx              keymile        -           tuxx1:TUXX1
+kmsupx5                      powerpc     mpc83xx     km83xx              keymile        -           tuxx1:KMSUPX5
 sbc8548                      powerpc     mpc85xx     sbc8548             -              -           sbc8548
 sbc8548_PCI_33               powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33
 sbc8548_PCI_33_PCIE          powerpc     mpc85xx     sbc8548             -              -           sbc8548:PCI,33,PCIE

diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index 90d2e61147ba2b169abed8713777f04981a67146..3997717193da96ebc95e31b7e744e3ee74680c5a 100644 (file)
--- a/include/configs/tuxx1.h
+++ b/include/configs/tuxx1.h
@@ -11,7 +11,7 @@
  * (C) Copyright 2008
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
- * (C) Copyright 2010-2012
+ * (C) Copyright 2010-2013
  * Lukas Roggli, KEYMILE Ltd, lukas.roggli@keymile.com
  * Holger Brunck,  Keymile GmbH, holger.bruncl@keymile.com
  *
@@ -27,16 +27,17 @@
 /*
  * High Level Configuration Options
  */
-#ifdef CONFIG_KMSUPX5
+#if defined(CONFIG_KMSUPX5)
 #define CONFIG_KM_BOARD_NAME   "kmsupx5"
 #define CONFIG_HOSTNAME                kmsupx5
-#elif defined CONFIG_TUGE1
+#elif defined(CONFIG_TUGE1)
 #define CONFIG_KM_BOARD_NAME   "tuge1"
 #define CONFIG_HOSTNAME                tuge1
-#else
-#define CONFIG_TUXXX           /* TUXX1 board (tuxa1/tuda1) specific */
+#elif defined(CONFIG_TUXX1)    /* TUXX1 board (tuxa1/tuda1) specific */
 #define CONFIG_KM_BOARD_NAME   "tuxx1"
 #define CONFIG_HOSTNAME                tuxx1
+#else
+#error ("Board not supported")
 #endif
 
 #define        CONFIG_SYS_TEXT_BASE    0xF0000000
@@ -46,7 +47,7 @@
 
 #define CONFIG_SYS_APP1_BASE   0xA0000000    /* PAXG */
 #define        CONFIG_SYS_APP1_SIZE    256 /* Megabytes */
-#ifndef CONFIG_KM_DISABLE_APP2
+#if defined(CONFIG_TUXX1)
 #define CONFIG_SYS_APP2_BASE   0xB0000000    /* PINC3 */
 #define        CONFIG_SYS_APP2_SIZE    256 /* Megabytes */
 #endif
@@ -81,7 +82,7 @@
                                 OR_GPCM_TRLX_SET | \
                                 OR_GPCM_EHTR_CLEAR | \
                                 OR_GPCM_EAD)
-#ifndef CONFIG_KM_DISABLE_APP2
+#if defined(CONFIG_TUXX1)
 /*
  * Configuration for C3 on the local bus
  */
@@ -125,7 +126,7 @@
                                 BATL_GUARDEDSTORAGE)
 #define CONFIG_SYS_DBAT5U      CONFIG_SYS_IBAT5U
 
-#ifdef CONFIG_KM_DISABLE_APP2
+#if defined(CONFIG_TUGE1) || defined(CONFIG_KMSUPX5)
 #define CONFIG_SYS_IBAT6L      (0)
 #define CONFIG_SYS_IBAT6U      (0)
 #define CONFIG_SYS_DBAT6L      CONFIG_SYS_IBAT6L