Skip to contentSkip to conversation

davinci: da850evm: Make EEPROM MAC code configurable

PATCH New Adam Ford 2 participants 4 messages Sep 8, 2017 – Sep 14, 2017

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/2 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 <[email protected]>
---
 board/davinci/da8xxevm/da850evm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
board/davinci/da8xxevm/da850evm.c +4 -1
index c2d2e8e..516d86d 100644
@@ -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;
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 2/2 Convert CONFIG_MAC_ADDR_IN_SPIFLASH et al to Kconfig

This converts the following to Kconfig:
CONFIG_MAC_ADDR_IN_SPIFLASH
CONFIG_MAC_ADDR_IN_EEPROM

Signed-off-by Adam Ford <[email protected]>
---
 board/davinci/da8xxevm/Kconfig        | 24 ++++++++++++++++++++++++
 configs/da850_am18xxevm_defconfig     |  3 ++-
 configs/da850evm_defconfig            |  1 -
 configs/da850evm_direct_nor_defconfig |  2 +-
 scripts/config_whitelist.txt          |  2 --
 5 files changed, 27 insertions(+), 5 deletions(-)
board/davinci/da8xxevm/Kconfig +24 -0
index 0935abf..6e51ce4 100644
@@ -9,6 +9,30 @@ config SYS_VENDOR
 config SYS_CONFIG_NAME
 	default "da850evm"
 
+menuconfig DA850_MAC
+	bool "Use MAC Address"
+	default y
+
+if DA850_MAC
+config MAC_ADDR_IN_SPIFLASH
+	bool "MAC address in SPI Flash"
+	default y
+	help
+	  The OMAP-L138 and AM1808 SoM are programmed with
+	  their MAC address in SPI Flash from the factory
+	  Enable this option to read the MAC from SPI Flash
+
+config MAC_ADDR_IN_EEPROM
+	bool "MAC address in EEPROM"
+	help
+	  The DA850 EVM comes with SoM are programmed with
+	  their MAC address in SPI Flash from the factory,
+	  but the kit has an optional expansion board with
+	  EEPROM available.  Enable this option to read the
+	  MAC from the EEPROM
+
+endif
+
 endif
 
 if TARGET_OMAPL138_LCDK
configs/da850_am18xxevm_defconfig +2 -1
index cb3726d..ad9c66c 100644
@@ -1,12 +1,13 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
+CONFIG_MAC_ADDR_IN_EEPROM=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
+CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
configs/da850evm_defconfig +0 -1
index ac54235..3193bbd 100644
@@ -6,7 +6,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
configs/da850evm_direct_nor_defconfig +1 -1
index 9c1ae37..ec31e7c 100644
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
-CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
+CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT"
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
scripts/config_whitelist.txt +0 -2
index 9ce0c3f..5dc69ea 100644
@@ -1360,8 +1360,6 @@ CONFIG_MACH_SPECIFIC
 CONFIG_MACH_TYPE
 CONFIG_MACH_TYPE_COMPAT_REV
 CONFIG_MACRESET_TIMEOUT
-CONFIG_MAC_ADDR_IN_EEPROM
-CONFIG_MAC_ADDR_IN_SPIFLASH
 CONFIG_MALLOC_F_ADDR
 CONFIG_MALTA
 CONFIG_MARCO_MEMSET
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/2 Convert CONFIG_MAC_ADDR_IN_SPIFLASH et al to Kconfig

Quoted 5 lines · Adam Ford

This converts the following to Kconfig:
CONFIG_MAC_ADDR_IN_SPIFLASH
CONFIG_MAC_ADDR_IN_EEPROM

Signed-off-by Adam Ford <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170913/e7cb050f/attachment.sig>
#3 lore raw

PATCH 1/2 davinci: da850evm: Make EEPROM MAC code configurable

In reply to Adam Ford
Quoted 8 lines · Adam Ford

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 <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170913/0fe0a27d/attachment.sig>