Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f0333b4c2e642df54f210e4506c4e1de216b4969

Authored by Adam Ford
Committed by Tom Rini
1 parent 919ccb9fe5
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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 <aford173@gmail.com>

Showing 5 changed files with 27 additions and 5 deletions Side-by-side Diff

board/davinci/da8xxevm/Kconfig
Diff comments   View file @ f0333b4
... ... @@ -9,6 +9,30 @@
9 9 config SYS_CONFIG_NAME
10 10 default "da850evm"
11 11  
  12 +menuconfig DA850_MAC
  13 + bool "Use MAC Address"
  14 + default y
  15 +
  16 +if DA850_MAC
  17 +config MAC_ADDR_IN_SPIFLASH
  18 + bool "MAC address in SPI Flash"
  19 + default y
  20 + help
  21 + The OMAP-L138 and AM1808 SoM are programmed with
  22 + their MAC address in SPI Flash from the factory
  23 + Enable this option to read the MAC from SPI Flash
  24 +
  25 +config MAC_ADDR_IN_EEPROM
  26 + bool "MAC address in EEPROM"
  27 + help
  28 + The DA850 EVM comes with SoM are programmed with
  29 + their MAC address in SPI Flash from the factory,
  30 + but the kit has an optional expansion board with
  31 + EEPROM available. Enable this option to read the
  32 + MAC from the EEPROM
  33 +
  34 +endif
  35 +
12 36 endif
13 37  
14 38 if TARGET_OMAPL138_LCDK
configs/da850_am18xxevm_defconfig
Diff comments   View file @ f0333b4
... ... @@ -2,12 +2,13 @@
2 2 CONFIG_ARCH_DAVINCI=y
3 3 CONFIG_TARGET_DA850EVM=y
4 4 CONFIG_TI_COMMON_CMD_OPTIONS=y
  5 +CONFIG_MAC_ADDR_IN_EEPROM=y
5 6 CONFIG_SPL_LIBCOMMON_SUPPORT=y
6 7 CONFIG_SPL_LIBGENERIC_SUPPORT=y
7 8 CONFIG_SPL_SERIAL_SUPPORT=y
8 9 CONFIG_SPL_SPI_FLASH_SUPPORT=y
9 10 CONFIG_SPL_SPI_SUPPORT=y
10   -CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
  11 +CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
11 12 CONFIG_BOOTDELAY=3
12 13 CONFIG_USE_BOOTARGS=y
13 14 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
configs/da850evm_defconfig
Diff comments   View file @ f0333b4
... ... @@ -7,7 +7,6 @@
7 7 CONFIG_SPL_SERIAL_SUPPORT=y
8 8 CONFIG_SPL_SPI_FLASH_SUPPORT=y
9 9 CONFIG_SPL_SPI_SUPPORT=y
10   -CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
11 10 CONFIG_BOOTDELAY=3
12 11 CONFIG_USE_BOOTARGS=y
13 12 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
configs/da850evm_direct_nor_defconfig
Diff comments   View file @ f0333b4
... ... @@ -2,7 +2,7 @@
2 2 CONFIG_ARCH_DAVINCI=y
3 3 CONFIG_TARGET_DA850EVM=y
4 4 CONFIG_TI_COMMON_CMD_OPTIONS=y
5   -CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
  5 +CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT"
6 6 CONFIG_BOOTDELAY=3
7 7 CONFIG_USE_BOOTARGS=y
8 8 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
scripts/config_whitelist.txt
Diff comments   View file @ f0333b4
... ... @@ -1359,8 +1359,6 @@
1359 1359 CONFIG_MACH_TYPE
1360 1360 CONFIG_MACH_TYPE_COMPAT_REV
1361 1361 CONFIG_MACRESET_TIMEOUT
1362   -CONFIG_MAC_ADDR_IN_EEPROM
1363   -CONFIG_MAC_ADDR_IN_SPIFLASH
1364 1362 CONFIG_MALLOC_F_ADDR
1365 1363 CONFIG_MALTA
1366 1364 CONFIG_MARCO_MEMSET