summaryrefslogtreecommitdiffstats
path: root/include/configs/tuxx1.h
diff options
context:
space:
mode:
authorHolger Brunck <holger.brunck@keymile.com>2012-03-21 13:42:42 +0100
committerKim Phillips <kim.phillips@freescale.com>2012-06-15 16:42:32 -0500
commit7f4bd9a6864a05acf8186c742ea3e52f8cb0b9e3 (patch)
tree7655d556f642df4013bb58b6a6ce3bea664874bc /include/configs/tuxx1.h
parent3b6b256c43c66b5524365892ae05c1567052ff11 (diff)
downloadblackbird-obmc-uboot-7f4bd9a6864a05acf8186c742ea3e52f8cb0b9e3.tar.gz
blackbird-obmc-uboot-7f4bd9a6864a05acf8186c742ea3e52f8cb0b9e3.zip
powerpc/83xx/km: use tuxx1.h for kmsupx5 target
This additional header is unneeded, we can use the tuxx1.h for this target. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Kim Phillips <kim.phillips@freescale.com> cc: Valentin Longchamp <valentin.longchamp@keymile.com> cc: Gerlando Falauto <gerlando.falauto@keymile.com> cc: Heiko Schocher <hs@denx.de> Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Diffstat (limited to 'include/configs/tuxx1.h')
-rw-r--r--include/configs/tuxx1.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h
index f6d2b17a38..90d2e61147 100644
--- 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-2011
+ * (C) Copyright 2010-2012
* Lukas Roggli, KEYMILE Ltd, lukas.roggli@keymile.com
* Holger Brunck, Keymile GmbH, holger.bruncl@keymile.com
*
@@ -27,12 +27,16 @@
/*
* High Level Configuration Options
*/
+#ifdef CONFIG_KMSUPX5
+#define CONFIG_KM_BOARD_NAME "kmsupx5"
+#define CONFIG_HOSTNAME kmsupx5
+#elif defined CONFIG_TUGE1
+#define CONFIG_KM_BOARD_NAME "tuge1"
+#define CONFIG_HOSTNAME tuge1
+#else
#define CONFIG_TUXXX /* TUXX1 board (tuxa1/tuda1) specific */
+#define CONFIG_KM_BOARD_NAME "tuxx1"
#define CONFIG_HOSTNAME tuxx1
-#ifdef CONFIG_KM_DISABLE_APP2
-#define CONFIG_KM_BOARD_NAME "tuge1"
-#else
-#define CONFIG_KM_BOARD_NAME "tuxx1"
#endif
#define CONFIG_SYS_TEXT_BASE 0xF0000000
@@ -50,10 +54,10 @@
/*
* Init Local Bus Memory Controller:
*
- * Bank Bus Machine PortSz Size Device on TUDA1 TUXA1 TUGE1
- * ---- --- ------- ------ ----- ----------------------------
- * 2 Local GPCM 8 bit 256MB PAXG LPXF PAXI
- * 3 Local GPCM 8 bit 256MB PINC3 PINC2 unused
+ * Bank Bus Machine PortSz Size Device on TUDA1 TUXA1 TUGE1 KMSUPX4
+ * ---- --- ------- ------ ----- ---------------------------------------
+ * 2 Local GPCM 8 bit 256MB PAXG LPXF PAXI LPXF
+ * 3 Local GPCM 8 bit 256MB PINC3 PINC2 unused unused
*
*/
OpenPOWER on IntegriCloud