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 'u-boot-ti/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
TOP860.h
diff --git
a/include/configs/TOP860.h
b/include/configs/TOP860.h
index
36921ca
..
4849f94
100644
(file)
--- a/
include/configs/TOP860.h
+++ b/
include/configs/TOP860.h
@@
-416,7
+416,6
@@
#define CONFIG_IPADDR 10.0.4.111
#define CONFIG_SYS_LOAD_ADDR 0x00100000 /* default load address */
-#define CONFIG_SYS_TFTP_LOADADDR 0x00100000
/*
* For booting Linux, the board info and command line data