Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f9268375044a27ebd8205f9a761541ce671bc656

Authored by Adam Ford
Committed by Tom Rini
1 parent 6c06f8dc4a
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

davinci: da850-evm: switch to using TI_COMMON_CMD_OPTIONS 

Like the OMAP-L138 LCDK before it, let's move the da850-evm and
the variations to TI_COMMON_CMD_OPTIONS to cut back one some of the
defconfig entries.

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

Showing 4 changed files with 37 additions and 26 deletions Inline Diff

board/davinci/da8xxevm/Kconfig
Diff comments   View file @ f926837
1 if TARGET_DA850EVM 1 if TARGET_DA850EVM
2 2
3 config SYS_BOARD 3 config SYS_BOARD
4 default "da8xxevm" 4 default "da8xxevm"
5 5
6 config SYS_VENDOR 6 config SYS_VENDOR
7 default "davinci" 7 default "davinci"
8 8
9 config SYS_CONFIG_NAME 9 config SYS_CONFIG_NAME
10 default "da850evm" 10 default "da850evm"
11 11
12 endif 12 endif
13 13
14 if TARGET_OMAPL138_LCDK 14 if TARGET_OMAPL138_LCDK
15 15
16 config SYS_BOARD 16 config SYS_BOARD
17 default "da8xxevm" 17 default "da8xxevm"
18 18
19 config SYS_VENDOR 19 config SYS_VENDOR
20 default "davinci" 20 default "davinci"
21 21
22 config SYS_CONFIG_NAME 22 config SYS_CONFIG_NAME
23 default "omapl138_lcdk" 23 default "omapl138_lcdk"
24 24
25 source "board/ti/common/Kconfig"
26
27 endif 25 endif
26
configs/da850_am18xxevm_defconfig
Diff comments   View file @ f926837
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_DAVINCI=y 2 CONFIG_ARCH_DAVINCI=y
3 CONFIG_TARGET_DA850EVM=y 3 CONFIG_TARGET_DA850EVM=y
4 CONFIG_TI_COMMON_CMD_OPTIONS=y
4 CONFIG_SPL_LIBCOMMON_SUPPORT=y 5 CONFIG_SPL_LIBCOMMON_SUPPORT=y
5 CONFIG_SPL_LIBGENERIC_SUPPORT=y 6 CONFIG_SPL_LIBGENERIC_SUPPORT=y
6 CONFIG_SPL_SERIAL_SUPPORT=y 7 CONFIG_SPL_SERIAL_SUPPORT=y
7 CONFIG_SPL_SPI_FLASH_SUPPORT=y 8 CONFIG_SPL_SPI_FLASH_SUPPORT=y
8 CONFIG_SPL_SPI_SUPPORT=y 9 CONFIG_SPL_SPI_SUPPORT=y
9 CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50" 10 CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
10 CONFIG_BOOTDELAY=3 11 CONFIG_BOOTDELAY=3
11 CONFIG_USE_BOOTARGS=y 12 CONFIG_USE_BOOTARGS=y
12 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" 13 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
13 CONFIG_VERSION_VARIABLE=y 14 CONFIG_VERSION_VARIABLE=y
14 # CONFIG_DISPLAY_CPUINFO is not set 15 # CONFIG_DISPLAY_CPUINFO is not set
15 # CONFIG_DISPLAY_BOARDINFO is not set 16 # CONFIG_DISPLAY_BOARDINFO is not set
16 CONFIG_BOARD_EARLY_INIT_F=y 17 CONFIG_BOARD_EARLY_INIT_F=y
17 CONFIG_SPL=y 18 CONFIG_SPL=y
18 CONFIG_SPL_BOARD_INIT=y 19 CONFIG_SPL_BOARD_INIT=y
19 CONFIG_HUSH_PARSER=y 20 CONFIG_HUSH_PARSER=y
21 # CONFIG_CMD_BOOTZ is not set
20 # CONFIG_CMD_IMLS is not set 22 # CONFIG_CMD_IMLS is not set
21 CONFIG_CMD_ASKENV=y
22 CONFIG_CRC32_VERIFY=y 23 CONFIG_CRC32_VERIFY=y
24 # CONFIG_CMD_EEPROM is not set
23 # CONFIG_CMD_FLASH is not set 25 # CONFIG_CMD_FLASH is not set
24 CONFIG_CMD_MMC=y 26 # CONFIG_CMD_GPIO is not set
25 CONFIG_CMD_SF=y 27 # CONFIG_CMD_GPT is not set
26 CONFIG_CMD_SPI=y 28 # CONFIG_CMD_I2C is not set
29 # CONFIG_CMD_PART is not set
27 # CONFIG_CMD_SETEXPR is not set 30 # CONFIG_CMD_SETEXPR is not set
28 CONFIG_CMD_DHCP=y 31 # CONFIG_CMD_TIME is not set
29 CONFIG_CMD_MII=y 32 # CONFIG_CMD_EXT4 is not set
30 CONFIG_CMD_PING=y 33 # CONFIG_CMD_FS_GENERIC is not set
31 CONFIG_CMD_EXT2=y
32 CONFIG_CMD_FAT=y
33 CONFIG_CMD_DIAG=y 34 CONFIG_CMD_DIAG=y
34 CONFIG_ENV_IS_IN_SPI_FLASH=y 35 CONFIG_ENV_IS_IN_SPI_FLASH=y
35 CONFIG_SPI_FLASH=y 36 CONFIG_SPI_FLASH=y
36 CONFIG_SPI_FLASH_STMICRO=y 37 CONFIG_SPI_FLASH_STMICRO=y
37 CONFIG_SPI_FLASH_WINBOND=y 38 CONFIG_SPI_FLASH_WINBOND=y
38 CONFIG_SYS_NS16550=y 39 CONFIG_SYS_NS16550=y
configs/da850evm_defconfig
Diff comments   View file @ f926837
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_DAVINCI=y 2 CONFIG_ARCH_DAVINCI=y
3 CONFIG_TARGET_DA850EVM=y 3 CONFIG_TARGET_DA850EVM=y
4 CONFIG_TI_COMMON_CMD_OPTIONS=y
4 CONFIG_SPL_LIBCOMMON_SUPPORT=y 5 CONFIG_SPL_LIBCOMMON_SUPPORT=y
5 CONFIG_SPL_LIBGENERIC_SUPPORT=y 6 CONFIG_SPL_LIBGENERIC_SUPPORT=y
6 CONFIG_SPL_SERIAL_SUPPORT=y 7 CONFIG_SPL_SERIAL_SUPPORT=y
7 CONFIG_SPL_SPI_FLASH_SUPPORT=y 8 CONFIG_SPL_SPI_FLASH_SUPPORT=y
8 CONFIG_SPL_SPI_SUPPORT=y 9 CONFIG_SPL_SPI_SUPPORT=y
9 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" 10 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
10 CONFIG_BOOTDELAY=3 11 CONFIG_BOOTDELAY=3
11 CONFIG_USE_BOOTARGS=y 12 CONFIG_USE_BOOTARGS=y
12 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" 13 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
13 CONFIG_VERSION_VARIABLE=y 14 CONFIG_VERSION_VARIABLE=y
14 # CONFIG_DISPLAY_CPUINFO is not set 15 # CONFIG_DISPLAY_CPUINFO is not set
15 # CONFIG_DISPLAY_BOARDINFO is not set 16 # CONFIG_DISPLAY_BOARDINFO is not set
16 CONFIG_BOARD_EARLY_INIT_F=y 17 CONFIG_BOARD_EARLY_INIT_F=y
17 CONFIG_SPL=y 18 CONFIG_SPL=y
18 CONFIG_SPL_BOARD_INIT=y 19 CONFIG_SPL_BOARD_INIT=y
19 CONFIG_HUSH_PARSER=y 20 CONFIG_HUSH_PARSER=y
20 CONFIG_SYS_PROMPT="U-Boot > " 21 CONFIG_SYS_PROMPT="U-Boot > "
21 CONFIG_CMD_BOOTZ=y
22 # CONFIG_CMD_IMLS is not set 22 # CONFIG_CMD_IMLS is not set
23 CONFIG_CMD_ASKENV=y
24 CONFIG_CRC32_VERIFY=y 23 CONFIG_CRC32_VERIFY=y
24 # CONFIG_CMD_EEPROM is not set
25 # CONFIG_CMD_FLASH is not set 25 # CONFIG_CMD_FLASH is not set
26 CONFIG_CMD_MMC=y 26 # CONFIG_CMD_GPIO is not set
27 CONFIG_CMD_SF=y 27 # CONFIG_CMD_GPT is not set
28 CONFIG_CMD_SPI=y 28 # CONFIG_CMD_I2C is not set
29 # CONFIG_CMD_PART is not set
29 # CONFIG_CMD_SETEXPR is not set 30 # CONFIG_CMD_SETEXPR is not set
30 CONFIG_CMD_DHCP=y 31 # CONFIG_CMD_TIME is not set
31 CONFIG_CMD_MII=y 32 # CONFIG_CMD_EXT4 is not set
32 CONFIG_CMD_PING=y 33 # CONFIG_CMD_FS_GENERIC is not set
33 CONFIG_CMD_EXT2=y
34 CONFIG_CMD_FAT=y
35 CONFIG_CMD_DIAG=y 34 CONFIG_CMD_DIAG=y
36 CONFIG_ENV_IS_IN_SPI_FLASH=y 35 CONFIG_ENV_IS_IN_SPI_FLASH=y
37 CONFIG_SPI_FLASH=y 36 CONFIG_SPI_FLASH=y
38 CONFIG_SPI_FLASH_STMICRO=y 37 CONFIG_SPI_FLASH_STMICRO=y
39 CONFIG_SPI_FLASH_WINBOND=y 38 CONFIG_SPI_FLASH_WINBOND=y
configs/da850evm_direct_nor_defconfig
Diff comments   View file @ f926837
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_DAVINCI=y 2 CONFIG_ARCH_DAVINCI=y
3 CONFIG_TARGET_DA850EVM=y 3 CONFIG_TARGET_DA850EVM=y
4 CONFIG_TI_COMMON_CMD_OPTIONS=y
4 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT" 5 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
5 CONFIG_BOOTDELAY=3 6 CONFIG_BOOTDELAY=3
6 CONFIG_USE_BOOTARGS=y 7 CONFIG_USE_BOOTARGS=y
7 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" 8 CONFIG_BOOTARGS="mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
8 CONFIG_VERSION_VARIABLE=y 9 CONFIG_VERSION_VARIABLE=y
9 # CONFIG_DISPLAY_CPUINFO is not set 10 # CONFIG_DISPLAY_CPUINFO is not set
10 # CONFIG_DISPLAY_BOARDINFO is not set 11 # CONFIG_DISPLAY_BOARDINFO is not set
11 CONFIG_BOARD_EARLY_INIT_F=y 12 CONFIG_BOARD_EARLY_INIT_F=y
12 CONFIG_HUSH_PARSER=y 13 CONFIG_HUSH_PARSER=y
13 CONFIG_SYS_PROMPT="U-Boot > " 14 CONFIG_SYS_PROMPT="U-Boot > "
14 CONFIG_CMD_ASKENV=y 15 # CONFIG_CMD_BOOTZ is not set
15 CONFIG_CRC32_VERIFY=y 16 CONFIG_CRC32_VERIFY=y
16 CONFIG_CMD_SF=y 17 # CONFIG_CMD_EEPROM is not set
18 # CONFIG_CMD_GPIO is not set
19 # CONFIG_CMD_GPT is not set
20 # CONFIG_CMD_I2C is not set
21 # CONFIG_CMD_MMC is not set
22 # CONFIG_CMD_PART is not set
23 # CONFIG_CMD_SPI is not set
17 # CONFIG_CMD_SETEXPR is not set 24 # CONFIG_CMD_SETEXPR is not set
18 CONFIG_CMD_DHCP=y 25 # CONFIG_CMD_TIME is not set
19 CONFIG_CMD_MII=y 26 # CONFIG_CMD_EXT2 is not set
20 CONFIG_CMD_PING=y 27 # CONFIG_CMD_EXT4 is not set
28 # CONFIG_CMD_FAT is not set
29 # CONFIG_CMD_FS_GENERIC is not set
21 CONFIG_CMD_DIAG=y 30 CONFIG_CMD_DIAG=y
22 CONFIG_ENV_IS_IN_FLASH=y 31 CONFIG_ENV_IS_IN_FLASH=y
23 # CONFIG_MMC is not set 32 # CONFIG_MMC is not set
24 CONFIG_MTD_NOR_FLASH=y 33 CONFIG_MTD_NOR_FLASH=y
25 CONFIG_SPI_FLASH=y 34 CONFIG_SPI_FLASH=y
26 CONFIG_SPI_FLASH_STMICRO=y 35 CONFIG_SPI_FLASH_STMICRO=y
27 CONFIG_SPI_FLASH_WINBOND=y 36 CONFIG_SPI_FLASH_WINBOND=y
28 CONFIG_SYS_NS16550=y 37 CONFIG_SYS_NS16550=y
29 CONFIG_OF_LIBFDT=y 38 CONFIG_OF_LIBFDT=y
30 39