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

[u-boot] / configs / icon_defconfig

diff --git a/configs/icon_defconfig b/configs/icon_defconfig
index 6556fa608bab95d09fc0db104dcda4187e80a4ce..9a9544bb6312c956cb1c2dad2ca51f0b7ea92f68 100644 (file)
--- a/configs/icon_defconfig
+++ b/configs/icon_defconfig
@@ -1,9 +1,13 @@
 CONFIG_PPC=y
+CONFIG_VIDEO=y
 CONFIG_4xx=y
 CONFIG_TARGET_ICON=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
+# CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
@@ -17,4 +21,5 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_SYS_NS16550=y
+CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y