Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / configs / intip_defconfig

diff --git a/configs/intip_defconfig b/configs/intip_defconfig
index 79360af07a92350ca64d63c064f825ed82d5031c..7893f640fdf315b99f032ceade99cd5c657483bc 100644 (file)
--- a/configs/intip_defconfig
+++ b/configs/intip_defconfig
@@ -1,5 +1,7 @@
-CONFIG_SYS_EXTRA_OPTIONS="INTIB"
 CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_INTIP=y
-CONFIG_REGEX=y
+CONFIG_SYS_EXTRA_OPTIONS="INTIB"
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_SYS_NS16550=y