Message ID | 20161110161635.7275-1-fparent@baylibre.com |
---|---|
State | Accepted |
Commit | 02c2de6eb0e2b4170329a51fae3aeb955b330f7b |
Headers | show |
On Thu, Nov 10, 2016 at 05:16:35PM +0100, Fabien Parent wrote: > 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> -- Tom _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
On Thu, Nov 10, 2016 at 05:16:35PM +0100, Fabien Parent wrote: > 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> Applied to u-boot/master, thanks! -- Tom _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 9783b2a..9c1a483 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -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())
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> --- board/davinci/da8xxevm/omapl138_lcdk.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.10.2 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot