diff options
author | Wolfgang Denk <wd@denx.de> | 2008-10-12 23:25:50 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-10-12 23:25:50 +0200 |
commit | 1e841086df55d6b8f2efcf0e5dfb5fc52a0c7bbe (patch) | |
tree | e649f78027dcb8432d90f99aed284d711b36582d /include/configs/MPC837XERDB.h | |
parent | 33af3e6656e84660d397b5dd95abab2dccc36f83 (diff) | |
parent | 72c55878ecb1f0fdc8bc13516e5cb18fbae505e7 (diff) | |
download | u-boot-imx-1e841086df55d6b8f2efcf0e5dfb5fc52a0c7bbe.zip u-boot-imx-1e841086df55d6b8f2efcf0e5dfb5fc52a0c7bbe.tar.gz u-boot-imx-1e841086df55d6b8f2efcf0e5dfb5fc52a0c7bbe.tar.bz2 |
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'include/configs/MPC837XERDB.h')
-rw-r--r-- | include/configs/MPC837XERDB.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2ac4ad0..f818b0f 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -253,6 +253,7 @@ #define CFG_FLASH_BASE 0xFE000000 /* FLASH base address */ #define CFG_FLASH_SIZE 8 /* max FLASH size is 32M */ +#define CFG_FLASH_PROTECTION 1 /* Use h/w Flash protection. */ #define CFG_FLASH_EMPTY_INFO /* display empty sectors */ #define CFG_FLASH_USE_BUFFER_WRITE /* buffer up multiple bytes */ @@ -632,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 |