commit 9fd2a02540dae32473cdb462cc6aa0fd1b4a4dd7
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 169bb3bac451615ac9c36ca58d28a8fa9a36194e

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/qemu-x86_defconfig

diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index c41cf16..3921570 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -1,8 +1,7 @@
 CONFIG_X86=y
-CONFIG_VIDEO=y
+CONFIG_MAX_CPUS=2
 CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
 CONFIG_SMP=y
-CONFIG_MAX_CPUS=2
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_ACPI_TABLE=y