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-sunxi
[platform/kernel/u-boot.git]
/
include
/
configs
/
nas220.h
diff --git
a/include/configs/nas220.h
b/include/configs/nas220.h
index
ca5cb2a
..
bdfa42f
100644
(file)
--- a/
include/configs/nas220.h
+++ b/
include/configs/nas220.h
@@
-69,7
+69,6
@@
"0x500000@0xc0000(uimage),"\
"0x1a40000@0x5c0000(rootfs)\0" \
"mtdids=nand0=orion_nand\0"\
- "bootdelay=-1\0"\
"autostart=no\0"\
"autoload=no\0"