configs: Re-sync CONFIG_CMD_IMLS with moveconfig
The option is specified in Kconfig, but still a few config header files are overriding the choice by #undef'ing it. Re-sync the option with moveconfig to rid of the #undefs. Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
This commit is contained in:
parent
ad12dc1844
commit
45c9d96ae4
@ -14,7 +14,6 @@ CONFIG_USE_BOOTARGS=y
|
|||||||
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
|
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
|
||||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||||
CONFIG_HUSH_PARSER=y
|
CONFIG_HUSH_PARSER=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GREPENV=y
|
CONFIG_CMD_GREPENV=y
|
||||||
CONFIG_CMD_GPT=y
|
CONFIG_CMD_GPT=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
|
@ -14,7 +14,6 @@ CONFIG_USE_BOOTARGS=y
|
|||||||
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
|
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
|
||||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||||
CONFIG_HUSH_PARSER=y
|
CONFIG_HUSH_PARSER=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GREPENV=y
|
CONFIG_CMD_GREPENV=y
|
||||||
CONFIG_CMD_EEPROM=y
|
CONFIG_CMD_EEPROM=y
|
||||||
CONFIG_CMD_GPT=y
|
CONFIG_CMD_GPT=y
|
||||||
|
@ -14,7 +14,6 @@ CONFIG_USE_BOOTARGS=y
|
|||||||
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
|
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 quiet lpj=250000"
|
||||||
# CONFIG_DISPLAY_BOARDINFO is not set
|
# CONFIG_DISPLAY_BOARDINFO is not set
|
||||||
CONFIG_HUSH_PARSER=y
|
CONFIG_HUSH_PARSER=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GREPENV=y
|
CONFIG_CMD_GREPENV=y
|
||||||
CONFIG_CMD_GPT=y
|
CONFIG_CMD_GPT=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
|
@ -3,7 +3,6 @@ CONFIG_TARGET_LS1021AIOT=y
|
|||||||
CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
|
CONFIG_DEFAULT_DEVICE_TREE="ls1021a-iot-duart"
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
|
CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
|
||||||
CONFIG_BOARD_EARLY_INIT_F=y
|
CONFIG_BOARD_EARLY_INIT_F=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GPT=y
|
CONFIG_CMD_GPT=y
|
||||||
CONFIG_CMD_EXT2=y
|
CONFIG_CMD_EXT2=y
|
||||||
CONFIG_CMD_FAT=y
|
CONFIG_CMD_FAT=y
|
||||||
|
@ -6,7 +6,6 @@ CONFIG_BOARD_EARLY_INIT_F=y
|
|||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
|
||||||
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8
|
CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xe8
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GPT=y
|
CONFIG_CMD_GPT=y
|
||||||
CONFIG_CMD_EXT2=y
|
CONFIG_CMD_EXT2=y
|
||||||
CONFIG_CMD_FAT=y
|
CONFIG_CMD_FAT=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_OF_BOARD_SETUP=y
|
|||||||
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
|
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
|
||||||
CONFIG_HUSH_PARSER=y
|
CONFIG_HUSH_PARSER=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
CONFIG_CMD_SF=y
|
CONFIG_CMD_SF=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_OF_BOARD_SETUP=y
|
|||||||
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
|
CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
|
||||||
CONFIG_HUSH_PARSER=y
|
CONFIG_HUSH_PARSER=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
CONFIG_CMD_SF=y
|
CONFIG_CMD_SF=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
|
@ -18,7 +18,6 @@ CONFIG_SPL=y
|
|||||||
CONFIG_SPL_ENV_SUPPORT=y
|
CONFIG_SPL_ENV_SUPPORT=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
|
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GREPENV=y
|
CONFIG_CMD_GREPENV=y
|
||||||
CONFIG_CMD_EEPROM=y
|
CONFIG_CMD_EEPROM=y
|
||||||
CONFIG_CMD_GPT=y
|
CONFIG_CMD_GPT=y
|
||||||
|
@ -10,7 +10,6 @@ CONFIG_QSPI_BOOT=y
|
|||||||
CONFIG_BOOTDELAY=10
|
CONFIG_BOOTDELAY=10
|
||||||
CONFIG_USE_BOOTARGS=y
|
CONFIG_USE_BOOTARGS=y
|
||||||
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
|
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0 earlycon=uart8250,mmio,0x21c0500 ramdisk_size=0x2000000 default_hugepagesz=2m hugepagesz=2m hugepages=256"
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GREPENV=y
|
CONFIG_CMD_GREPENV=y
|
||||||
CONFIG_CMD_EEPROM=y
|
CONFIG_CMD_EEPROM=y
|
||||||
CONFIG_CMD_GPT=y
|
CONFIG_CMD_GPT=y
|
||||||
|
@ -21,7 +21,6 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x8b0
|
|||||||
CONFIG_SPL_ENV_SUPPORT=y
|
CONFIG_SPL_ENV_SUPPORT=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
|
CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GREPENV=y
|
CONFIG_CMD_GREPENV=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
|
@ -4,7 +4,6 @@ CONFIG_TARGET_MX7ULP_EVK=y
|
|||||||
CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk"
|
CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk"
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
|
||||||
CONFIG_HUSH_PARSER=y
|
CONFIG_HUSH_PARSER=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GPIO=y
|
CONFIG_CMD_GPIO=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
|
@ -4,7 +4,6 @@ CONFIG_TARGET_MX7ULP_EVK=y
|
|||||||
CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk"
|
CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk"
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg"
|
||||||
CONFIG_HUSH_PARSER=y
|
CONFIG_HUSH_PARSER=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GPIO=y
|
CONFIG_CMD_GPIO=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
|
@ -7,6 +7,5 @@ CONFIG_USE_BOOTARGS=y
|
|||||||
CONFIG_BOOTARGS="console=ttyLF0 root=/dev/ram rw"
|
CONFIG_BOOTARGS="console=ttyLF0 root=/dev/ram rw"
|
||||||
CONFIG_BOARD_EARLY_INIT_F=y
|
CONFIG_BOARD_EARLY_INIT_F=y
|
||||||
CONFIG_CMD_BOOTZ=y
|
CONFIG_CMD_BOOTZ=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_ENV_IS_IN_MMC=y
|
CONFIG_ENV_IS_IN_MMC=y
|
||||||
CONFIG_OF_LIBFDT=y
|
CONFIG_OF_LIBFDT=y
|
||||||
|
@ -18,7 +18,6 @@ CONFIG_BOARD_EARLY_INIT_F=y
|
|||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_EXT_SUPPORT=y
|
CONFIG_SPL_EXT_SUPPORT=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GPIO=y
|
CONFIG_CMD_GPIO=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
|
@ -18,7 +18,6 @@ CONFIG_BOARD_EARLY_INIT_F=y
|
|||||||
CONFIG_SPL=y
|
CONFIG_SPL=y
|
||||||
CONFIG_SPL_EXT_SUPPORT=y
|
CONFIG_SPL_EXT_SUPPORT=y
|
||||||
CONFIG_SPL_I2C_SUPPORT=y
|
CONFIG_SPL_I2C_SUPPORT=y
|
||||||
CONFIG_CMD_IMLS=y
|
|
||||||
CONFIG_CMD_GPIO=y
|
CONFIG_CMD_GPIO=y
|
||||||
CONFIG_CMD_I2C=y
|
CONFIG_CMD_I2C=y
|
||||||
CONFIG_CMD_MMC=y
|
CONFIG_CMD_MMC=y
|
||||||
|
@ -56,9 +56,6 @@
|
|||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
#define CONFIG_MXC_UART_BASE UART2_BASE
|
#define CONFIG_MXC_UART_BASE UART2_BASE
|
||||||
|
|
||||||
/* Command definition */
|
|
||||||
#undef CONFIG_CMD_IMLS
|
|
||||||
|
|
||||||
#define CONFIG_BOARD_NAME EL6Q
|
#define CONFIG_BOARD_NAME EL6Q
|
||||||
|
|
||||||
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
||||||
|
@ -82,9 +82,6 @@
|
|||||||
|
|
||||||
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
|
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
|
||||||
|
|
||||||
/* Command line configuration */
|
|
||||||
#undef CONFIG_CMD_IMLS
|
|
||||||
|
|
||||||
#define CONFIG_SYS_HZ 1000
|
#define CONFIG_SYS_HZ 1000
|
||||||
|
|
||||||
#define CONFIG_HWCONFIG
|
#define CONFIG_HWCONFIG
|
||||||
|
@ -215,10 +215,6 @@
|
|||||||
#define CONFIG_CMDLINE_TAG
|
#define CONFIG_CMDLINE_TAG
|
||||||
#define CONFIG_CMDLINE_EDITING
|
#define CONFIG_CMDLINE_EDITING
|
||||||
|
|
||||||
#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT)
|
|
||||||
#undef CONFIG_CMD_IMLS
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define CONFIG_PEN_ADDR_BIG_ENDIAN
|
#define CONFIG_PEN_ADDR_BIG_ENDIAN
|
||||||
#define CONFIG_LAYERSCAPE_NS_ACCESS
|
#define CONFIG_LAYERSCAPE_NS_ACCESS
|
||||||
#define CONFIG_SMP_PEN_ADDR 0x01ee0200
|
#define CONFIG_SMP_PEN_ADDR 0x01ee0200
|
||||||
|
@ -35,7 +35,6 @@ unsigned long get_board_ddr_clk(void);
|
|||||||
#define CONFIG_QIXIS_I2C_ACCESS
|
#define CONFIG_QIXIS_I2C_ACCESS
|
||||||
#define SYS_NO_FLASH
|
#define SYS_NO_FLASH
|
||||||
|
|
||||||
#undef CONFIG_CMD_IMLS
|
|
||||||
#define CONFIG_SYS_CLK_FREQ 100000000
|
#define CONFIG_SYS_CLK_FREQ 100000000
|
||||||
#define CONFIG_DDR_CLK_FREQ 100000000
|
#define CONFIG_DDR_CLK_FREQ 100000000
|
||||||
#else
|
#else
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
#if defined(CONFIG_QSPI_BOOT)
|
#if defined(CONFIG_QSPI_BOOT)
|
||||||
#define CONFIG_QIXIS_I2C_ACCESS
|
#define CONFIG_QIXIS_I2C_ACCESS
|
||||||
#define SYS_NO_FLASH
|
#define SYS_NO_FLASH
|
||||||
#undef CONFIG_CMD_IMLS
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_SYS_CLK_FREQ 100000000
|
#define CONFIG_SYS_CLK_FREQ 100000000
|
||||||
|
@ -16,7 +16,6 @@ unsigned long get_board_ddr_clk(void);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_FSL_QSPI
|
#ifdef CONFIG_FSL_QSPI
|
||||||
#undef CONFIG_CMD_IMLS
|
|
||||||
#define CONFIG_QIXIS_I2C_ACCESS
|
#define CONFIG_QIXIS_I2C_ACCESS
|
||||||
#define CONFIG_SYS_I2C_EARLY_INIT
|
#define CONFIG_SYS_I2C_EARLY_INIT
|
||||||
#define CONFIG_SYS_I2C_IFDR_DIV 0x7e
|
#define CONFIG_SYS_I2C_IFDR_DIV 0x7e
|
||||||
|
@ -68,7 +68,6 @@
|
|||||||
#define CONFIG_CONS_INDEX 1
|
#define CONFIG_CONS_INDEX 1
|
||||||
#define CONFIG_BAUDRATE 115200
|
#define CONFIG_BAUDRATE 115200
|
||||||
|
|
||||||
#undef CONFIG_CMD_IMLS
|
|
||||||
#define CONFIG_SYS_LONGHELP
|
#define CONFIG_SYS_LONGHELP
|
||||||
#define CONFIG_AUTO_COMPLETE
|
#define CONFIG_AUTO_COMPLETE
|
||||||
|
|
||||||
|
@ -73,8 +73,6 @@
|
|||||||
#define CONFIG_ENV_OVERWRITE
|
#define CONFIG_ENV_OVERWRITE
|
||||||
#define CONFIG_SYS_UART_PORT (1)
|
#define CONFIG_SYS_UART_PORT (1)
|
||||||
|
|
||||||
#undef CONFIG_CMD_IMLS
|
|
||||||
|
|
||||||
#define CONFIG_FSL_ESDHC
|
#define CONFIG_FSL_ESDHC
|
||||||
#define CONFIG_FSL_USDHC
|
#define CONFIG_FSL_USDHC
|
||||||
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC_BASE_ADDR
|
#define CONFIG_SYS_FSL_ESDHC_ADDR USDHC_BASE_ADDR
|
||||||
|
Loading…
Reference in New Issue
Block a user