]> git.sur5r.net Git - u-boot/commitdiff
davinci: omapl138_lcdk: keep booting even when MAC address is invalid
authorFabien Parent <fparent@baylibre.com>
Thu, 10 Nov 2016 16:16:35 +0000 (17:16 +0100)
committerTom Rini <trini@konsulko.com>
Sun, 13 Nov 2016 20:54:35 +0000 (15:54 -0500)
If the MAC address specified on the EEPROM is invalid (multicast or
zero address), then u-boot fails to boot. Having a bad MAC address
in the EEPROM should not prevent the system from booting.

This commit changes the error path to just print an error messages
in case of bad MAC address.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
board/davinci/da8xxevm/omapl138_lcdk.c

index 9783b2a0bc612902024fced3ca0bf234352aa338..9c1a4833123636fdf3d34ce2af4b2f98e8ee74cf 100644 (file)
@@ -333,15 +333,17 @@ int misc_init_r(void)
                        get_mac_addr(addr);
                }
 
-               if (is_multicast_ethaddr(addr) || is_zero_ethaddr(addr)) {
+               if (!is_multicast_ethaddr(addr) && !is_zero_ethaddr(addr)) {
+                       sprintf((char *)tmp, "%02x:%02x:%02x:%02x:%02x:%02x",
+                               addr[0], addr[1], addr[2], addr[3], addr[4],
+                               addr[5]);
+
+                       setenv("ethaddr", (char *)tmp);
+               } else {
                        printf("Invalid MAC address read.\n");
-                       return -EINVAL;
                }
-               sprintf((char *)tmp, "%02x:%02x:%02x:%02x:%02x:%02x", addr[0],
-                               addr[1], addr[2], addr[3], addr[4], addr[5]);
-
-               setenv("ethaddr", (char *)tmp);
        }
+
 #ifdef CONFIG_DRIVER_TI_EMAC_USE_RMII
        /* Select RMII fucntion through the expander */
        if (rmii_hw_init())