From ef26d6039a14c03c516c09a7835b491e671a4b0b Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 17 Oct 2016 20:12:37 -0600 Subject: Convert CONFIG_SYS_CONSOLE_IS_IN_ENV and CONFIG_CONSOLE_MUX to Kconfig This converts the following to Kconfig: CONFIG_SYS_CONSOLE_IS_IN_ENV CONFIG_CONSOLE_MUX Signed-off-by: Simon Glass [trini: Re-order, re-migrate] Signed-off-by: Tom Rini --- configs/ls1046aqds_sdcard_qspi_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs/ls1046aqds_sdcard_qspi_defconfig') diff --git a/configs/ls1046aqds_sdcard_qspi_defconfig b/configs/ls1046aqds_sdcard_qspi_defconfig index cb8e63568d..8a14862535 100644 --- a/configs/ls1046aqds_sdcard_qspi_defconfig +++ b/configs/ls1046aqds_sdcard_qspi_defconfig @@ -1,14 +1,13 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046AQDS=y -CONFIG_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-qds-duart" -CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT_QSPI" CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=10 +CONFIG_SPL=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set @@ -28,5 +27,6 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y CONFIG_FSL_QSPI=y -- cgit v1.2.1