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 branch 'master' of git://git.denx.de/u-boot-usb
[platform/kernel/u-boot.git]
/
configs
/
am335x_shc_sdboot_prompt_defconfig
diff --git
a/configs/am335x_shc_sdboot_prompt_defconfig
b/configs/am335x_shc_sdboot_prompt_defconfig
index
2767012
..
b0e8eff
100644
(file)
--- a/
configs/am335x_shc_sdboot_prompt_defconfig
+++ b/
configs/am335x_shc_sdboot_prompt_defconfig
@@
-6,7
+6,6
@@
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
CONFIG_FIT=y
-CONFIG_BOOTDELAY=5
CONFIG_SYS_PROMPT="U-Boot# "
CONFIG_AUTOBOOT_KEYED=y
CONFIG_AUTOBOOT_PROMPT="Enter 'shc' to enter prompt (times out) %d \nEnter 'noautoboot' to enter prompt without timeout\n"