Blackfin: bf518f-ezbrd: get MAC from flash
authorMike Frysinger <vapier@gentoo.org>
Thu, 17 Mar 2011 21:14:14 +0000 (17:14 -0400)
committerMike Frysinger <vapier@gentoo.org>
Fri, 8 Apr 2011 04:44:27 +0000 (00:44 -0400)
The MAC address is stored in the last flash sector rather than OTP.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
board/bf518f-ezbrd/bf518f-ezbrd.c

index 6b455de38019d8e6139fe8f55b17e27e9f33431a..09a2353e7d93f26f730e5691507941ca62c22f93 100644 (file)
@@ -30,24 +30,21 @@ 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 0
-       /* the MAC is stored in OTP memory page 0xDF */
-       uint32_t ret;
-       uint64_t otp_mac;
-
-       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))
+       if (USE_MAC_IN_FLASH) {
+               /* we cram the MAC in the last flash sector */
+               uchar *board_mac_addr = (uchar *)0x203F0096;
+               if (is_valid_ether_addr(board_mac_addr)) {
+                       memcpy(mac_addr, board_mac_addr, 6);
                        valid_mac = true;
+               }
        }
-#endif
 
        if (!valid_mac) {
                puts("Warning: Generating 'random' MAC address\n");
@@ -154,6 +151,12 @@ int misc_init_r(void)
                board_init_enetaddr(enetaddr);
 #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;
 }