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 3aa372fb2b6ebb4d722cd6b390c45a5fe968dfbb..7893f640fdf315b99f032ceade99cd5c657483bc 100644 (file)
--- a/configs/intip_defconfig
+++ b/configs/intip_defconfig
@@ -2,4 +2,6 @@ CONFIG_PPC=y
 CONFIG_4xx=y
 CONFIG_TARGET_INTIP=y
 CONFIG_SYS_EXTRA_OPTIONS="INTIB"
-CONFIG_REGEX=y
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_SYS_NS16550=y