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-net
[platform/kernel/u-boot.git]
/
include
/
configs
/
vme8349.h
diff --git
a/include/configs/vme8349.h
b/include/configs/vme8349.h
index
732d091
..
60513df
100644
(file)
--- a/
include/configs/vme8349.h
+++ b/
include/configs/vme8349.h
@@
-542,7
+542,6
@@
#define CONFIG_LOADADDR 800000 /* def location for tftp and bootm */
-#define CONFIG_BOOTDELAY 6 /* -1 disables auto-boot */
#undef CONFIG_BOOTARGS /* boot command will set bootargs */
#define CONFIG_BAUDRATE 9600