Message ID | 1382089644-14595-6-git-send-email-valentin.longchamp@keymile.com |
---|---|
State | Accepted |
Delegated to: | York Sun |
Headers | show |
On 10/18/2013 02:47 AM, Valentin Longchamp wrote: > This must be defined by a board support file that want to use the > keymile common.c board_eth_init function that requires ethernet_present > to be defined. > > Currently all the km architectures use it but the kmp204x architecture > later supported in this series does use another board_eth_init function > and thus does not define it. > > Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> > > --- > Changes in v4: None > Changes in v3: None > Changes in v2: > - add CONFIG_KM_COMMON_ETH_INIT for the km board that need the common.c > board_eth_init Applied to 85xx/next, pending merge to 85xx/master. York
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 3d7b056..f941e44 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -142,6 +142,7 @@ void i2c_init_board(void) } #endif +#if defined(CONFIG_KM_COMMON_ETH_INIT) int board_eth_init(bd_t *bis) { if (ethernet_present()) @@ -149,6 +150,7 @@ int board_eth_init(bd_t *bis) return -1; } +#endif /* * do_setboardid command diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 15fef24..2cebb2b 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -17,6 +17,9 @@ #define CONFIG_CMD_DTT #define CONFIG_JFFS2_CMDLINE +/* standard km ethernet_present for piggy */ +#define CONFIG_KM_COMMON_ETH_INIT + /* EEprom support 24C08, 24C16, 24C64 */ #define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 36c2fba..e74f85f 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -164,6 +164,7 @@ #define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ #define CONFIG_PHY_BASE_ADR 0 #define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ +#define CONFIG_KM_COMMON_ETH_INIT /* standard km ethernet_present for piggy */ /* * UBI related stuff
This must be defined by a board support file that want to use the keymile common.c board_eth_init function that requires ethernet_present to be defined. Currently all the km architectures use it but the kmp204x architecture later supported in this series does use another board_eth_init function and thus does not define it. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> --- Changes in v4: None Changes in v3: None Changes in v2: - add CONFIG_KM_COMMON_ETH_INIT for the km board that need the common.c board_eth_init board/keymile/common/common.c | 2 ++ include/configs/km/km-powerpc.h | 3 +++ include/configs/km/km_arm.h | 1 + 3 files changed, 6 insertions(+)