From ef26d6039a14c03c516c09a7835b491e671a4b0b Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
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 <sjg@chromium.org>
[trini: Re-order, re-migrate]
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/fo300_defconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'configs/fo300_defconfig')

diff --git a/configs/fo300_defconfig b/configs/fo300_defconfig
index 55b5798131..d65391e59e 100644
--- a/configs/fo300_defconfig
+++ b/configs/fo300_defconfig
@@ -6,6 +6,8 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_SYS_EXTRA_OPTIONS="FO300"
 CONFIG_BOOTDELAY=5
 CONFIG_SILENT_CONSOLE=y
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_LOOPW=y
-- 
cgit v1.2.3