diff options
| author | Valentin Longchamp <valentin.longchamp@keymile.com> | 2013-10-18 11:47:18 +0200 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2013-10-24 09:35:40 -0700 |
| commit | 99f6249a0e7b36e4f9c1aa7b77a0814d883d96b2 (patch) | |
| tree | 26a8db0d2df84f555c8599be8295adf567108d25 | |
| parent | 0a4f88b98c098532bfe0a4a5f874e6e05708c4f3 (diff) | |
| download | talos-obmc-uboot-99f6249a0e7b36e4f9c1aa7b77a0814d883d96b2.tar.gz talos-obmc-uboot-99f6249a0e7b36e4f9c1aa7b77a0814d883d96b2.zip | |
KM: add CONFIG_KM_COMMON_ETH_INIT for km common eth init
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>
| -rw-r--r-- | board/keymile/common/common.c | 2 | ||||
| -rw-r--r-- | include/configs/km/km-powerpc.h | 3 | ||||
| -rw-r--r-- | include/configs/km/km_arm.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 3d7b05661a..f941e44e83 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 15fef24db0..2cebb2bb0c 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 36c2fba9e6..e74f85f604 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 |
