[U-Boot] [PATCH 0/2] Davinci, MAC addr improvements
Two fixes related to MAC address setting on Davinci boards.
The following changes since commit 54b08efcf2f4ff532ce99c53f341a59c193331a5:
README.mips: update known issues and TODOs (2013-01-16 10:52:08 +0100)
are available in the git repository at:
git://gitorious.org/~kibo/u-boot-shr/kibos-u-boot master http://gitorious.org/~kibo/u-boot-shr/kibos-u-boot/commits/master
Kim Bøndergaard (2): Davinci: Make MAC address offset in EEPROM configurable, CONFIG_MAC_EEPROM_ADDR Davinci: Fix, console output confusing while setting MAC address
arch/arm/cpu/arm926ejs/davinci/misc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
--- arch/arm/cpu/arm926ejs/davinci/misc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/cpu/arm926ejs/davinci/misc.c b/arch/arm/cpu/arm926ejs/davinci/misc.c index c310c69..d0389a4 100644 --- a/arch/arm/cpu/arm926ejs/davinci/misc.c +++ b/arch/arm/cpu/arm926ejs/davinci/misc.c @@ -55,11 +55,14 @@ void dram_init_banksize(void) * Read ethernet MAC address from EEPROM for DVEVM compatible boards. * Returns 1 if found, 0 otherwise. */ +#ifndef CONFIG_MAC_EEPROM_ADDR +#define CONFIG_MAC_EEPROM_ADDR 0x7F00 +#endif int dvevm_read_mac_address(uint8_t *buf) { #ifdef CONFIG_SYS_I2C_EEPROM_ADDR /* Read MAC address. */ - if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0x7F00, + if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, CONFIG_MAC_EEPROM_ADDR, CONFIG_SYS_I2C_EEPROM_ADDR_LEN, (uint8_t *) &buf[0], 6)) goto i2cerr;
--- arch/arm/cpu/arm926ejs/davinci/misc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/davinci/misc.c b/arch/arm/cpu/arm926ejs/davinci/misc.c index d0389a4..dc74af6 100644 --- a/arch/arm/cpu/arm926ejs/davinci/misc.c +++ b/arch/arm/cpu/arm926ejs/davinci/misc.c @@ -104,10 +104,8 @@ void davinci_emac_mii_mode_sel(int mode_sel) void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr) { uint8_t env_enetaddr[6]; - int ret;
- ret = eth_getenv_enetaddr_by_index("eth", 0, env_enetaddr); - if (ret) { + if (!eth_getenv_enetaddr_by_index("eth", 0, env_enetaddr)) { /* * There is no MAC address in the environment, so we * initialize it from the value in the EEPROM. @@ -115,10 +113,9 @@ void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr) debug("### Setting environment from EEPROM MAC address = " ""%pM"\n", env_enetaddr); - ret = !eth_setenv_enetaddr("ethaddr", rom_enetaddr); + if (!eth_setenv_enetaddr("ethaddr", rom_enetaddr)) + printf("Failed to set mac address from EEPROM\n"); } - if (!ret) - printf("Failed to set mac address from EEPROM\n"); } #endif /* CONFIG_DRIVER_TI_EMAC */
participants (1)
-
Kim Bøndergaard