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/mx25pdk.h | |
parent | 3786a942b5892441982f5d8908303f360bac9f8c (diff) | |
parent | 1d4fd0dc3b45de7b7a706285845ef5b527422014 (diff) |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/mx25pdk.h')
-rw-r--r-- | include/configs/mx25pdk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index a4bd8b0aed6..b5338a00090 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -130,7 +130,7 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_NET -#define CONFIG_BOOTDELAY 3 +#define CONFIG_BOOTDELAY 1 #define CONFIG_LOADADDR 0x81000000 /* loadaddr env var */ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR |