Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[u-boot] / board / bf518f-ezbrd / bf518f-ezbrd.c

diff --git a/board/bf518f-ezbrd/bf518f-ezbrd.c b/board/bf518f-ezbrd/bf518f-ezbrd.c
index ff1ac4cda80a5e172eb229a42c78063e49baf506..09a2353e7d93f26f730e5691507941ca62c22f93 100644 (file)
--- a/board/bf518f-ezbrd/bf518f-ezbrd.c
+++ b/board/bf518f-ezbrd/bf518f-ezbrd.c
@@ -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");
@@ -57,6 +54,13 @@ static void board_init_enetaddr(uchar *mac_addr)
        eth_setenv_enetaddr("ethaddr", mac_addr);
 }
 
+/* Only the first run of boards had a KSZ switch */
+#if defined(CONFIG_BFIN_SPI) && __SILICON_REVISION__ == 0
+# define KSZ_POSSIBLE 1
+#else
+# define KSZ_POSSIBLE 0
+#endif
+
 #define KSZ_MAX_HZ    5000000
 
 #define KSZ_WRITE     0x02
@@ -109,17 +113,16 @@ static int ksz8893m_reset(struct spi_slave *slave)
        return ret;
 }
 
-int board_eth_init(bd_t *bis)
+static bool board_ksz_init(void)
 {
-       static bool switch_is_alive = false, phy_is_ksz = true;
-       int ret;
+       static bool switch_is_alive = false;
 
        if (!switch_is_alive) {
                struct spi_slave *slave = spi_setup_slave(0, 1, KSZ_MAX_HZ, SPI_MODE_3);
                if (slave) {
                        if (!spi_claim_bus(slave)) {
-                               phy_is_ksz = (ksz8893m_reg_read(slave, KSZ_REG_CHID) == 0x88);
-                               ret = phy_is_ksz ? ksz8893m_reset(slave) : 0;
+                               bool phy_is_ksz = (ksz8893m_reg_read(slave, KSZ_REG_CHID) == 0x88);
+                               int ret = phy_is_ksz ? ksz8893m_reset(slave) : 0;
                                switch_is_alive = (ret == 0);
                                spi_release_bus(slave);
                        }
@@ -127,10 +130,16 @@ int board_eth_init(bd_t *bis)
                }
        }
 
-       if (switch_is_alive)
-               return bfin_EMAC_initialize(bis);
-       else
-               return -1;
+       return switch_is_alive;
+}
+
+int board_eth_init(bd_t *bis)
+{
+       if (KSZ_POSSIBLE) {
+               if (!board_ksz_init())
+                       return 0;
+       }
+       return bfin_EMAC_initialize(bis);
 }
 #endif
 
@@ -142,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;
 }