diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-05-04 14:55:15 -0500 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-05-20 11:07:27 -0500 |
| commit | 76ec988b062ed880ab23d0e0d4e9e6c137b55cc3 (patch) | |
| tree | 9f97bb7d62c2c8114f688c512e6169f105db1fba /board/dnp5370 | |
| parent | 92ac520821405e196c920d60921bdfa5ab6b878c (diff) | |
| download | u-boot-76ec988b062ed880ab23d0e0d4e9e6c137b55cc3.tar.gz u-boot-76ec988b062ed880ab23d0e0d4e9e6c137b55cc3.tar.bz2 u-boot-76ec988b062ed880ab23d0e0d4e9e6c137b55cc3.zip | |
net: Remove all calls to net_random_ethaddr()
Remove the calls to net_random_ethaddr() that some boards and some
drivers are calling. This is now implemented inside of net/eth.c
Enable the feature for all boards that previously enabled it.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-By: Michael Walle <michael@walle.cc> (for the lsxl board part)
Series-changes: 2
-Fixed bfin build errors
Diffstat (limited to 'board/dnp5370')
| -rw-r--r-- | board/dnp5370/dnp5370.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/board/dnp5370/dnp5370.c b/board/dnp5370/dnp5370.c index 655fcace2b..ae9ba84dc2 100644 --- a/board/dnp5370/dnp5370.c +++ b/board/dnp5370/dnp5370.c @@ -36,28 +36,14 @@ int checkboard(void) #ifdef CONFIG_BFIN_MAC static void board_init_enetaddr(uchar *mac_addr) { -#ifdef CONFIG_SYS_NO_FLASH -# define USE_MAC_IN_FLASH 0 -#else -# define USE_MAC_IN_FLASH 1 -#endif - bool valid_mac = false; - - if (USE_MAC_IN_FLASH) { - /* we cram the MAC in the last flash sector */ - uchar *board_mac_addr = (uchar *)0x202F0000; - if (is_valid_ethaddr(board_mac_addr)) { - memcpy(mac_addr, board_mac_addr, 6); - valid_mac = true; - } - } - - if (!valid_mac) { - puts("Warning: Generating 'random' MAC address\n"); - net_random_ethaddr(mac_addr); +#ifndef CONFIG_SYS_NO_FLASH + /* we cram the MAC in the last flash sector */ + uchar *board_mac_addr = (uchar *)0x202F0000; + if (is_valid_ethaddr(board_mac_addr)) { + memcpy(mac_addr, board_mac_addr, 6); + eth_setenv_enetaddr("ethaddr", mac_addr); } - - eth_setenv_enetaddr("ethaddr", mac_addr); +#endif } int board_eth_init(bd_t *bis) |