diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-11-25 13:01:58 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-11-25 13:01:58 +0100 |
| commit | b8a7c467960ffb4d5a5e1eef5f7783fb6f594542 (patch) | |
| tree | da95eeaa6578048658ff60f20a9b498730c67917 /include/configs/mx6qsabre_common.h | |
| parent | 3786a942b5892441982f5d8908303f360bac9f8c (diff) | |
| parent | 1d4fd0dc3b45de7b7a706285845ef5b527422014 (diff) | |
| download | u-boot-imx-b8a7c467960ffb4d5a5e1eef5f7783fb6f594542.zip u-boot-imx-b8a7c467960ffb4d5a5e1eef5f7783fb6f594542.tar.gz u-boot-imx-b8a7c467960ffb4d5a5e1eef5f7783fb6f594542.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/mx6qsabre_common.h')
| -rw-r--r-- | include/configs/mx6qsabre_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/mx6qsabre_common.h b/include/configs/mx6qsabre_common.h index 50f3b01..b8621b8 100644 --- a/include/configs/mx6qsabre_common.h +++ b/include/configs/mx6qsabre_common.h @@ -76,7 +76,7 @@ #define CONFIG_CMD_BOOTZ #undef CONFIG_CMD_IMLS -#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 1 #define CONFIG_LOADADDR 0x10800000 #define CONFIG_SYS_TEXT_BASE 0x17800000 |