diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-20 15:57:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-20 15:57:55 -0400 |
| commit | 3238639d40732fe78fd62ae5e080465552e882fc (patch) | |
| tree | b9f0f8565adf69504faf56fc7032068573e5fabe /board/bf518f-ezbrd | |
| parent | cb0892b968e52fe0d09b4d51119d8f913685ed3c (diff) | |
| parent | 76ec988b062ed880ab23d0e0d4e9e6c137b55cc3 (diff) | |
| download | talos-obmc-uboot-3238639d40732fe78fd62ae5e080465552e882fc.tar.gz talos-obmc-uboot-3238639d40732fe78fd62ae5e080465552e882fc.zip | |
Merge git://git.denx.de/u-boot-net
Diffstat (limited to 'board/bf518f-ezbrd')
| -rw-r--r-- | board/bf518f-ezbrd/bf518f-ezbrd.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/board/bf518f-ezbrd/bf518f-ezbrd.c b/board/bf518f-ezbrd/bf518f-ezbrd.c index 8ecfbb28c9..bf4a7db03d 100644 --- a/board/bf518f-ezbrd/bf518f-ezbrd.c +++ b/board/bf518f-ezbrd/bf518f-ezbrd.c @@ -29,28 +29,14 @@ int checkboard(void) #if defined(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 *)0x203F0096; - 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 *)0x203F0096; + 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 } /* Only the first run of boards had a KSZ switch */ |
