diff options
| author | Holger Brunck <holger.brunck@keymile.com> | 2011-03-14 15:31:19 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-30 00:44:18 +0200 |
| commit | 802d996324777173f123116c00a6c654f4a4177a (patch) | |
| tree | 03a220fe2f0514f38f940f1760ae476dcb980a78 | |
| parent | 7c6db910492520a4b21bdd9071d89b6f87069d13 (diff) | |
| download | blackbird-obmc-uboot-802d996324777173f123116c00a6c654f4a4177a.tar.gz blackbird-obmc-uboot-802d996324777173f123116c00a6c654f4a4177a.zip | |
arm, keymile: rename MACH_SUEN3 to MACH_KM_KIRKWOOD
The MACH_TYPE SUEN3 is now to specific for keymile boards, because
other boards similar to suen3 will follow. So the MACH_SUEN3 was renamed
to MACH_KM_KIRKWOOD.
Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Heiko Schocher <hs@denx.de>
cc: Wolfgang Denk <wd@denx.de>
cc: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
| -rw-r--r-- | board/keymile/common/common.c | 4 | ||||
| -rw-r--r-- | board/keymile/km_arm/km_arm.c | 2 | ||||
| -rw-r--r-- | include/configs/km_arm.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 7b4eefd5c8..86be9c25da 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -500,7 +500,7 @@ void i2c_init_board(void) out_8 (&dev->cr, (I2C_CR_MEN)); #else -#if defined(CONFIG_HARD_I2C) && !defined(CONFIG_MACH_SUEN3) +#if defined(CONFIG_HARD_I2C) && !defined(MACH_TYPE_KM_KIRKWOOD) volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c; @@ -578,7 +578,7 @@ int fdt_get_node_and_value (void *blob, } #endif -#if !defined(CONFIG_MACH_SUEN3) +#if !defined(MACH_TYPE_KM_KIRKWOOD) int ethernet_present (void) { return (in_8((u8 *)CONFIG_SYS_PIGGY_BASE + CONFIG_SYS_SLOT_ID_OFF) & 0x80); diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index dcf0f422eb..bf03f0c0d9 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -173,7 +173,7 @@ int board_init(void) /* * arch number of board */ - gd->bd->bi_arch_number = MACH_TYPE_SUEN3; + gd->bd->bi_arch_number = MACH_TYPE_KM_KIRKWOOD; /* address of boot parameters */ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index bf77cc0542..533da73ac9 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -38,7 +38,7 @@ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KIRKWOOD /* SOC Family Name */ #define CONFIG_KW88F6281 /* SOC Name */ -#define CONFIG_MACH_SUEN3 /* Machine type */ +#define CONFIG_MACH_KM_KIRKWOOD /* Machine type */ /* include common defines/options for all Keymile boards */ #include "keymile-common.h" |
