Blackfin: bf518f-ezbrd: get MAC from flash

The MAC address is stored in the last flash sector rather than OTP.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2011-03-17 17:14:14 -04:00
parent d413dbc990
commit 03feb8ed2e

View file

@ -30,24 +30,21 @@ int checkboard(void)
#if defined(CONFIG_BFIN_MAC) #if defined(CONFIG_BFIN_MAC)
static void board_init_enetaddr(uchar *mac_addr) 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; bool valid_mac = false;
#if 0 if (USE_MAC_IN_FLASH) {
/* the MAC is stored in OTP memory page 0xDF */ /* we cram the MAC in the last flash sector */
uint32_t ret; uchar *board_mac_addr = (uchar *)0x203F0096;
uint64_t otp_mac; if (is_valid_ether_addr(board_mac_addr)) {
memcpy(mac_addr, board_mac_addr, 6);
ret = bfrom_OtpRead(0xDF, OTP_LOWER_HALF, &otp_mac);
if (!(ret & OTP_MASTER_ERROR)) {
uchar *otp_mac_p = (uchar *)&otp_mac;
for (ret = 0; ret < 6; ++ret)
mac_addr[ret] = otp_mac_p[5 - ret];
if (is_valid_ether_addr(mac_addr))
valid_mac = true; valid_mac = true;
}
} }
#endif
if (!valid_mac) { if (!valid_mac) {
puts("Warning: Generating 'random' MAC address\n"); puts("Warning: Generating 'random' MAC address\n");
@ -154,6 +151,12 @@ int misc_init_r(void)
board_init_enetaddr(enetaddr); board_init_enetaddr(enetaddr);
#endif #endif
#ifndef CONFIG_SYS_NO_FLASH
/* we use the last sector for the MAC address / POST LDR */
extern flash_info_t flash_info[];
flash_protect(FLAG_PROTECT_SET, 0x203F0000, 0x203FFFFF, &flash_info[0]);
#endif
return 0; return 0;
} }