diff options
| author | Stefan Roese <sr@denx.de> | 2008-10-13 11:17:31 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2008-10-13 11:17:31 +0200 |
| commit | 1f6aa622e365fef9d87de84753eb08347e310a2a (patch) | |
| tree | 232149e6d93c9387b03628c5d3283cecf7719476 /include/configs/MPC837XERDB.h | |
| parent | 542b385a620a1783454a00424930e51895f45073 (diff) | |
| parent | df4a0796e86662536df2387ddcf969c2a704bcc2 (diff) | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
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 2ac4ad0fa45..f818b0fdb0c 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 |