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://www.denx.de/git/u-boot-nand-flash
[platform/kernel/u-boot.git]
/
include
/
configs
/
M54455EVB.h
diff --git
a/include/configs/M54455EVB.h
b/include/configs/M54455EVB.h
index
f33ccb0
..
3a022af
100644
(file)
--- a/
include/configs/M54455EVB.h
+++ b/
include/configs/M54455EVB.h
@@
-83,9
+83,9
@@
/* Network configuration */
#define CONFIG_MCFFEC
#ifdef CONFIG_MCFFEC
/* Network configuration */
#define CONFIG_MCFFEC
#ifdef CONFIG_MCFFEC
-# define CONFIG_NET_MULTI 1
+# define CONFIG_NET_MULTI
1
# define CONFIG_MII 1
# define CONFIG_MII 1
-# define CONFIG_
CF_DOMII
+# define CONFIG_
MII_INIT 1
# define CFG_DISCOVER_PHY
# define CFG_RX_ETH_BUFFER 8
# define CFG_FAULT_ECHO_LINK_DOWN
# define CFG_DISCOVER_PHY
# define CFG_RX_ETH_BUFFER 8
# define CFG_FAULT_ECHO_LINK_DOWN
@@
-179,7
+179,7
@@
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI 1
#define CONFIG_PCI_PNP 1
#ifdef CONFIG_CMD_PCI
#define CONFIG_PCI 1
#define CONFIG_PCI_PNP 1
-#define CONFIG_
SKIPPCI_HOSTBRIDGE
+#define CONFIG_
PCIAUTO_SKIP_HOST_BRIDGE 1
#define CFG_PCI_CACHE_LINE_SIZE 4
#define CFG_PCI_CACHE_LINE_SIZE 4