From: Adam Ford <aford173@gmail.com>
Date: Fri, 8 Sep 2017 22:01:17 +0000 (-0500)
Subject: davinci: da850evm: Make EEPROM MAC code configurable
X-Git-Tag: v2017.11-rc1~139
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=919ccb9fe55febcc628e43dc1fea00ecc71e8bdf;p=oweals%2Fu-boot.git

davinci: da850evm: Make EEPROM MAC code configurable

There was a check for CONFIG_MAC_ADDR_IN_EEPROM and
a check for CONFIG_MAC_ADDR_IN_SPIFLASH, however
some of the EEPROM related code wasn't encapsulated
inside the #if defined statement so the EEPROM code
could get executed even when it wasn't explicitly
enabled or wanted.

Signed-off-by: Adam Ford <aford173@gmail.com>
---

diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index c2d2e8e882..516d86df50 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -133,6 +133,8 @@ int misc_init_r(void)
 
 	enetaddr_found = eth_env_get_enetaddr("ethaddr", env_enetaddr);
 
+#endif
+
 #ifdef CONFIG_MAC_ADDR_IN_SPIFLASH
 	int spi_mac_read;
 	uchar buff[6];
@@ -167,7 +169,8 @@ int misc_init_r(void)
 					"with the MAC address in the environment\n");
 		printf("Default using MAC address from environment\n");
 	}
-#endif
+
+#elif defined(CONFIG_MAC_ADDR_IN_EEPROM)
 	uint8_t enetaddr[8];
 	int eeprom_mac_read;