diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-08 13:15:45 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-08 13:15:45 +0100 |
| commit | 79f38777947ac7685e2cef8bd977f954ab198c0e (patch) | |
| tree | 6fe053ef751b1c424ec50be338844197b6421d74 /board/technexion/twister/twister.c | |
| parent | 96764df1b47ddebfb50fadf5af72530b07b5fc89 (diff) | |
| parent | 9bd5c1ad0db802c9f8d49d72b443f03431cf6a89 (diff) | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
This required manual merging drivers/mtd/nand/Makefile
and adding am335x_evm support for CONFIG_SPL_NAND_DRIVERS
Diffstat (limited to 'board/technexion/twister/twister.c')
| -rw-r--r-- | board/technexion/twister/twister.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/board/technexion/twister/twister.c b/board/technexion/twister/twister.c index 1471559909d..c9eea9b3045 100644 --- a/board/technexion/twister/twister.c +++ b/board/technexion/twister/twister.c @@ -98,9 +98,12 @@ int board_init(void) return 0; } +#ifndef CONFIG_SPL_BUILD int misc_init_r(void) { char *eth_addr; + struct tam3517_module_info info; + int ret; dieid_num_r(); @@ -108,12 +111,13 @@ int misc_init_r(void) if (eth_addr) return 0; -#ifndef CONFIG_SPL_BUILD - TAM3517_READ_MAC_FROM_EEPROM; -#endif + TAM3517_READ_EEPROM(&info, ret); + if (!ret) + TAM3517_READ_MAC_FROM_EEPROM(&info); return 0; } +#endif /* * Routine: set_muxconf_regs |