commit ef26d6039a14c03c516c09a7835b491e671a4b0b
author Simon Glass <sjg@chromium.org> Mon Oct 17 20:12:37 2016 -0600
committer Tom Rini <trini@konsulko.com> Sun Oct 23 18:33:35 2016 -0400
tree d9a6957ab0709cb6870f251d718ffb3dd5ed9afa
parent f8b19a889e0d9d21af4be6b0fd6363a5b5a546f7

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/socrates_defconfig

diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index 52f67c3..46e5e82 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -6,6 +6,8 @@
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=1
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y