mpc83xx: don't disable autoboot

bootdelay set to -1 'permanently' disables autobooting, even if
bootcmd is specified.  Change to a positive value to allow
autobooting when a bootcmd is set.

Reported-by: Coray Tate <Coray.Tate@freescale.com>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>

diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h
index b36121758d1e9832402a3a88c48b2e593188e577..09bb87e3b2080fa348362156b047ebd3fc656f60 100644 (file)
--- a/include/configs/MPC8313ERDB.h
+++ b/include/configs/MPC8313ERDB.h
@@ -597,7 +597,7 @@
 #define CONFIG_FDTFILE         mpc8313erdb.dtb
 
 #define CONFIG_LOADADDR                500000  /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY       -1      /* -1 disables auto-boot */
+#define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #define CONFIG_BAUDRATE                115200
 
 #define XMK_STR(x)     #x

diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 697c5ad535961a457d88d125be3a4f818443c14d..1ae5bae7c0f29ef6cf982160838f3dd1e4a9164c 100644 (file)
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -571,7 +571,7 @@
 #define CONFIG_FDTFILE         mpc832x_rdb.dtb
 
 #define CONFIG_LOADADDR                500000  /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY       -1      /* -1 disables auto-boot */
+#define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #define CONFIG_BAUDRATE                115200
 
 #define XMK_STR(x)     #x

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index da7712159e4bc782c699091cf0a5a77735945940..f818b0fdb0c46142b06435d02f36c88a0d0b05c1 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -633,7 +633,7 @@
 #define CONFIG_FDTFILE         mpc8379_rdb.dtb
 
 #define CONFIG_LOADADDR                500000  /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY       -1      /* -1 disables auto-boot */
+#define CONFIG_BOOTDELAY       6       /* -1 disables auto-boot */
 #define CONFIG_BAUDRATE                115200
 
 #define XMK_STR(x)     #x