sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Holger Brunck 2011-03-14 15:31:19 +01:00 committed by Wolfgang Denk
parent 7c6db91049
commit 802d996324
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/keymile/common/common.c
View File

@ -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);

2
board/keymile/km_arm/km_arm.c
View File

@ -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;

2
include/configs/km_arm.h
View File

@ -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"