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/MPC8313ERDB.h | |
| parent | 542b385a620a1783454a00424930e51895f45073 (diff) | |
| parent | df4a0796e86662536df2387ddcf969c2a704bcc2 (diff) | |
| download | u-boot-imx-1f6aa622e365fef9d87de84753eb08347e310a2a.zip u-boot-imx-1f6aa622e365fef9d87de84753eb08347e310a2a.tar.gz u-boot-imx-1f6aa622e365fef9d87de84753eb08347e310a2a.tar.bz2 | |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
Diffstat (limited to 'include/configs/MPC8313ERDB.h')
| -rw-r--r-- | include/configs/MPC8313ERDB.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index 55d7852..09bb87e 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -174,6 +174,7 @@ #define CONFIG_FLASH_CFI_DRIVER /* use the CFI driver */ #define CFG_FLASH_BASE 0xFE000000 /* start of FLASH */ #define CFG_FLASH_SIZE 8 /* flash size in MB */ +#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 */ @@ -596,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 |