@@ -37,8 +37,8 @@
DECLARE_GLOBAL_DATA_PTR;
-#ifndef CONFIG_MVGBE_PORTS
-# define CONFIG_MVGBE_PORTS {0, 0}
+#ifndef CFG_MVGBE_PORTS
+# define CFG_MVGBE_PORTS {0, 0}
#endif
#define MV_PHY_ADR_REQUEST 0xee
@@ -832,7 +832,7 @@ int mvgbe_initialize(struct bd_info *bis)
struct eth_device *dev;
int devnum;
int ret;
- u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
+ u8 used_ports[MAX_MVGBE_DEVS] = CFG_MVGBE_PORTS;
for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) {
/*skip if port is configured not to use */
@@ -43,7 +43,7 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */
+#define CFG_MVGBE_PORTS {1, 0} /* enable a single port */
#define CONFIG_PHY_BASE_ADR 0x01
#endif /* CONFIG_CMD_NET */
@@ -48,7 +48,7 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable a single port */
+#define CFG_MVGBE_PORTS {1, 0} /* enable a single port */
#define CONFIG_PHY_BASE_ADR 0x01
#endif /* CONFIG_CMD_NET */
@@ -20,7 +20,7 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#endif
/*
@@ -31,7 +31,7 @@
/*
* Ethernet Driver configuration
*/
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 0
#endif /* _CONFIG_DOCKSTAR_H */
@@ -27,7 +27,7 @@
/*
* Ethernet Driver configuration
*/
-#define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
+#define CFG_MVGBE_PORTS {1, 1} /* enable both ports */
#define CONFIG_PHY_BASE_ADR 0
#endif /* _CONFIG_DREAMPLUG_H */
@@ -39,7 +39,7 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable one port */
+#define CFG_MVGBE_PORTS {1, 0} /* enable one port */
#define CONFIG_PHY_BASE_ADR 8
#endif /* CONFIG_CMD_NET */
@@ -39,7 +39,7 @@
/*
* Ethernet Driver configuration
*/
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 0
#endif /* _CONFIG_GOFLEXHOME_H */
@@ -34,7 +34,7 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
+#define CFG_MVGBE_PORTS {1, 1} /* enable both ports */
#define CONFIG_PHY_BASE_ADR 0
#endif /* CONFIG_CMD_NET */
@@ -28,7 +28,7 @@
* Ethernet driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 0
#endif /* CONFIG_CMD_NET */
@@ -22,7 +22,7 @@
* This board has PCIe Wifi card, so allow Ethernet to be disabled
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 11
#endif /* CONFIG_CMD_NET */
@@ -18,7 +18,7 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#endif
/*
@@ -43,7 +43,7 @@
* Ethernet Driver configuration
*/
#ifdef CONFIG_CMD_NET
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 8
#endif /* CONFIG_CMD_NET */
@@ -47,7 +47,7 @@
#endif /* CONFIG_SPL_BUILD */
/* Ethernet driver configuration */
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 1
#endif /* _CONFIG_NSA310S_H */
@@ -38,9 +38,9 @@
*/
#ifdef CONFIG_CMD_NET
# ifdef CONFIG_BOARD_IS_OPENRD_BASE
-# define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+# define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
# else
-# define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
+# define CFG_MVGBE_PORTS {1, 1} /* enable both ports */
# endif
# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE
# define CONFIG_PHY_BASE_ADR 0x0
@@ -26,7 +26,7 @@
/*
* Ethernet Driver configuration
*/
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 0
#endif /* _CONFIG_POGO_E02_H */
@@ -72,7 +72,7 @@
/*
* Ethernet Driver configuration
*/
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 0
#endif /* _CONFIG_POGO_V4_H */
@@ -24,7 +24,7 @@
/*
* Ethernet Driver configuration
*/
-#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */
+#define CFG_MVGBE_PORTS {1, 0} /* enable port 0 only */
#define CONFIG_PHY_BASE_ADR 0
#endif /* _CONFIG_SHEEVAPLUG_H */
@@ -132,7 +132,7 @@ CFG_MMC_DEFAULT_DEV
CFG_MMC_SUNXI_SLOT
CFG_MONITOR_IS_IN_RAM
CFG_MTD_NAND_VERIFY_WRITE
-CONFIG_MVGBE_PORTS
+CFG_MVGBE_PORTS
CONFIG_MXC_GPT_HCLK
CONFIG_MXC_NAND_HWECC
CONFIG_MXC_NAND_IP_REGS_BASE
Signed-off-by: Tom Rini <trini@konsulko.com> --- drivers/net/mvgbe.c | 6 +++--- include/configs/SBx81LIFKW.h | 2 +- include/configs/SBx81LIFXCAT.h | 2 +- include/configs/dns325.h | 2 +- include/configs/dockstar.h | 2 +- include/configs/dreamplug.h | 2 +- include/configs/ds109.h | 2 +- include/configs/goflexhome.h | 2 +- include/configs/guruplug.h | 2 +- include/configs/ib62x0.h | 2 +- include/configs/iconnect.h | 2 +- include/configs/lacie_kw.h | 2 +- include/configs/nas220.h | 2 +- include/configs/nsa310s.h | 2 +- include/configs/openrd.h | 4 ++-- include/configs/pogo_e02.h | 2 +- include/configs/pogo_v4.h | 2 +- include/configs/sheevaplug.h | 2 +- scripts/config_whitelist.txt | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-)