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
/
socfpga_socrates.h
diff --git
a/include/configs/socfpga_socrates.h
b/include/configs/socfpga_socrates.h
index
f0d9347
..
7faea15
100644
(file)
--- a/
include/configs/socfpga_socrates.h
+++ b/
include/configs/socfpga_socrates.h
@@
-14,8
+14,6
@@
#define CONFIG_LOADADDR 0x01000000
#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-/* Ethernet on SoC (EMAC) */
-
/* The rest of the configuration is shared */
#include <configs/socfpga_common.h>