Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / configs / cairo_defconfig

diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig
index a8775f3f53200de9d3b126a1983140506cfff841..5257312bfd0d52000566b80e3df86e18bcedabfb 100644 (file)
--- a/configs/cairo_defconfig
+++ b/configs/cairo_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_OMAP34XX=y
 CONFIG_TARGET_OMAP3_CAIRO=y
 CONFIG_SPL=y
+CONFIG_BOOTDELAY=0
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Cairo # "
 CONFIG_CMD_BOOTZ=y