Convert CONFIG_SYS_CONSOLE_IS_IN_ENV and CONFIG_CONSOLE_MUX to Kconfig

[u-boot] / include / configs / mx6cuboxi.h

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 640b43ec90fee7792d2f9bbe75ab6389af49734a..b6474fc6271aaf8f910415c097c48d4a56e92b3c 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -37,7 +37,6 @@
 #define CONFIG_IPUV3_CLK               260000000
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_SPLASH_SCREEN_ALIGN
@@ -47,7 +46,6 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_CMD_HDMIDETECT
 #define CONFIG_IMX_VIDEO_SKIP
-#define CONFIG_CONSOLE_MUX
 
 /* USB */
 #define CONFIG_USB_EHCI