Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[u-boot] / configs / omap3_mvblx_defconfig

diff --git a/configs/omap3_mvblx_defconfig b/configs/omap3_mvblx_defconfig
index b75f51323e8672d946f220744c5b9892b151bd57..415b02ebd849ee8eb701ced65162836d4c0fd7a5 100644 (file)
--- a/configs/omap3_mvblx_defconfig
+++ b/configs/omap3_mvblx_defconfig
@@ -1,6 +1,8 @@
 CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_MVBLX=y
-CONFIG_DM=n
-CONFIG_DM_SERIAL=n
-CONFIG_DM_GPIO=n
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_STOP_STR="S"
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_SETEXPR is not set