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://www.denx.de/git/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
blackstamp.h
diff --git
a/include/configs/blackstamp.h
b/include/configs/blackstamp.h
index
6eb83a0
..
dc596fa
100644
(file)
--- a/
include/configs/blackstamp.h
+++ b/
include/configs/blackstamp.h
@@
-106,7
+106,6
@@
#define CONFIG_CMD_CPLBINFO
#define CONFIG_CMD_DATE
-#define CONFIG_BOOTDELAY 5
#define CONFIG_BOOTCOMMAND "run ramboot"
#define CONFIG_BOOTARGS \
"root=/dev/mtdblock0 rw " \