projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx31pdk.h
diff --git
a/include/configs/mx31pdk.h
b/include/configs/mx31pdk.h
index
3b86c9e
..
138a941
100644
(file)
--- 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" \