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/mx31pdk.h | |
| parent | 3786a942b5892441982f5d8908303f360bac9f8c (diff) | |
| parent | 1d4fd0dc3b45de7b7a706285845ef5b527422014 (diff) | |
| download | blackbird-obmc-uboot-b8a7c467960ffb4d5a5e1eef5f7783fb6f594542.tar.gz blackbird-obmc-uboot-b8a7c467960ffb4d5a5e1eef5f7783fb6f594542.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/mx31pdk.h')
| -rw-r--r-- | include/configs/mx31pdk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 223b5b0bb9..6572676970 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -106,7 +106,7 @@ #define CONFIG_BOARD_LATE_INIT -#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 1 #define CONFIG_EXTRA_ENV_SETTINGS \ "bootargs_base=setenv bootargs console=ttymxc0,115200\0" \ |
