From 7f4bd9a6864a05acf8186c742ea3e52f8cb0b9e3 Mon Sep 17 00:00:00 2001 From: Holger Brunck Date: Wed, 21 Mar 2012 13:42:42 +0100 Subject: 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 cc: Kim Phillips cc: Valentin Longchamp cc: Gerlando Falauto cc: Heiko Schocher Signed-off-by: Kim Phillips --- include/configs/tuxx1.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'include/configs/tuxx1.h') 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 * */ -- cgit