summaryrefslogtreecommitdiff
path: root/configs/Merrii_A80_Optimus_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/Merrii_A80_Optimus_defconfig
parentf8b19a889e0d9d21af4be6b0fd6363a5b5a546f7 (diff)
downloadu-boot-ef26d6039a14c03c516c09a7835b491e671a4b0b.tar.gz
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/Merrii_A80_Optimus_defconfig')
-rw-r--r--configs/Merrii_A80_Optimus_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
index 198fda95fe..774d137ac8 100644
--- a/configs/Merrii_A80_Optimus_defconfig
+++ b/configs/Merrii_A80_Optimus_defconfig
@@ -7,6 +7,7 @@ CONFIG_SYS_CLK_FREQ=1008000000
CONFIG_MMC0_CD_PIN="PH18"
CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set