Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

[oweals/u-boot.git] / include / configs / MPC8323ERDB.h

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