summaryrefslogtreecommitdiff
path: root/configs/ls1021aqds_nor_lpuart_defconfig
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-10-17 20:12:37 -0600
committerTom Rini <trini@konsulko.com>2016-10-23 18:33:35 -0400
commitef26d6039a14c03c516c09a7835b491e671a4b0b (patch)
treed9a6957ab0709cb6870f251d718ffb3dd5ed9afa /configs/ls1021aqds_nor_lpuart_defconfig
parentf8b19a889e0d9d21af4be6b0fd6363a5b5a546f7 (diff)
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 <sjg@chromium.org> [trini: Re-order, re-migrate] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/ls1021aqds_nor_lpuart_defconfig')
-rw-r--r--configs/ls1021aqds_nor_lpuart_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig
index e20546c4cd..ea1132fd3b 100644
--- a/configs/ls1021aqds_nor_lpuart_defconfig
+++ b/configs/ls1021aqds_nor_lpuart_defconfig
@@ -1,5 +1,6 @@
CONFIG_ARM=y
CONFIG_TARGET_LS1021AQDS=y
+CONFIG_SYS_FSL_DDR3=y
CONFIG_VIDEO=y
CONFIG_DEFAULT_DEVICE_TREE="ls1021a-qds-lpuart"
CONFIG_FIT=y
@@ -7,9 +8,10 @@ CONFIG_FIT_VERBOSE=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_OF_STDOUT_VIA_ALIAS=y
CONFIG_SYS_EXTRA_OPTIONS="LPUART"
-CONFIG_SYS_FSL_DDR3=y
CONFIG_BOOTDELAY=3
CONFIG_SILENT_CONSOLE=y
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GREPENV=y