summaryrefslogtreecommitdiff
path: root/include/configs/MPC8323ERDB.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-10-12 23:25:50 +0200
committerWolfgang Denk <wd@denx.de>2008-10-12 23:25:50 +0200
commit1e841086df55d6b8f2efcf0e5dfb5fc52a0c7bbe (patch)
treee649f78027dcb8432d90f99aed284d711b36582d /include/configs/MPC8323ERDB.h
parent33af3e6656e84660d397b5dd95abab2dccc36f83 (diff)
parent72c55878ecb1f0fdc8bc13516e5cb18fbae505e7 (diff)
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'include/configs/MPC8323ERDB.h')
-rw-r--r--include/configs/MPC8323ERDB.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 977142b10f..1ae5bae7c0 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -181,6 +181,7 @@
#define CONFIG_FLASH_CFI_DRIVER /* use the CFI driver */
#define CFG_FLASH_BASE 0xFE000000 /* FLASH base address */
#define CFG_FLASH_SIZE 16 /* FLASH size is 16M */
+#define CFG_FLASH_PROTECTION 1 /* Use h/w Flash protection. */
#define CFG_LBLAWBAR0_PRELIM CFG_FLASH_BASE /* Window base at flash base */
#define CFG_LBLAWAR0_PRELIM 0x80000018 /* 32MB window size */
@@ -570,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