diff --git a/arch/arm/boards/optimus/env/config b/arch/arm/boards/optimus/env/config
index 20eba11..f67f04b 100644
--- a/arch/arm/boards/optimus/env/config
+++ b/arch/arm/boards/optimus/env/config
@@ -11,7 +11,11 @@
 nor_parts="128k(uloader)ro,512k(loader0)ro,512k(loader1)ro,128k(env),2M(hnvram),-(norreserved0)"
 nor_device="comcertoflash.0"
 
-autoboot_timeout=2
+if [ x${dev_mode} = x0 ]; then
+	autoboot_timeout=0
+else
+	autoboot_timeout=2
+fi
 
 bootargs="console=ttyS0,115200n8"
 
diff --git a/arch/arm/boards/optimus/env_spacecast/config b/arch/arm/boards/optimus/env_spacecast/config
index 4d31ab4..b117606 100644
--- a/arch/arm/boards/optimus/env_spacecast/config
+++ b/arch/arm/boards/optimus/env_spacecast/config
@@ -8,7 +8,11 @@
 nor_parts="128k(uloader)ro,512k(loader0)ro,512k(loader1)ro,128k(env),2M(hnvram),6M(kernel0),6M(kernel1),-(norreserved0)"
 nor_device="comcertoflash.0"
 
-autoboot_timeout=2
+if [ x${dev_mode} = x0 ]; then
+	autoboot_timeout=0
+else
+	autoboot_timeout=2
+fi
 
 if [ x${dev_mode} = x1 ] || [ x${recovery_mode} = x1 ]; then
 	bootargs="console=ttyS0,115200n8"