Merge git://git.denx.de/u-boot-mpc85xx

[u-boot] / configs / mcx_defconfig

diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index 28837f9a6066cef40b89eeaf4bf0c071bac87c97..9dc3c5abfd8cf9815e594aaf0184d95a5c7f2ab2 100644 (file)
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -3,8 +3,11 @@ CONFIG_OMAP34XX=y
 # CONFIG_SPL_GPIO_SUPPORT is not set
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_TARGET_MCX=y
+CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_SPL=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="mcx # "
@@ -29,4 +32,5 @@ CONFIG_USB=y
 CONFIG_USB_ULPI_VIEWPORT_OMAP=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_STORAGE=y
+# CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_OF_LIBFDT=y