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/ls1046ardb_qspi_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/ls1046ardb_qspi_defconfig') diff --git a/configs/ls1046ardb_qspi_defconfig b/configs/ls1046ardb_qspi_defconfig index 67ef3ce79f..8508c09336 100644 --- a/configs/ls1046ardb_qspi_defconfig +++ b/configs/ls1046ardb_qspi_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_TARGET_LS1046ARDB=y -CONFIG_DM_SPI=y CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb" CONFIG_FIT=y CONFIG_FIT_VERBOSE=y @@ -23,4 +22,5 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_SPI_FLASH=y CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y CONFIG_FSL_QSPI=y -- cgit v1.2.3