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-socfpga
[platform/kernel/u-boot.git]
/
include
/
configs
/
MPC8536DS.h
diff --git
a/include/configs/MPC8536DS.h
b/include/configs/MPC8536DS.h
index
03f17f9
..
7c19ff8
100644
(file)
--- a/
include/configs/MPC8536DS.h
+++ b/
include/configs/MPC8536DS.h
@@
-706,7
+706,6
@@
/* default location for tftp and bootm */
#define CONFIG_LOADADDR 1000000
-#define CONFIG_BOOTDELAY 10 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* the boot command will set bootargs */
#define CONFIG_BAUDRATE 115200