[PoC 124/241] global: Migrate CONFIG_MVGBE_PORTS to CFG

Tom Rini
2022-11-20T14:11:39Z

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(-)

diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index a77c05743262..373bb8b0d239 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -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 */
diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h
index bad34d9771ec..861ae530336a 100644
--- a/include/configs/SBx81LIFKW.h
+++ b/include/configs/SBx81LIFKW.h
@@ -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 */

diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h
index 9a9663b34ba8..418221ca72b3 100644
--- a/include/configs/SBx81LIFXCAT.h
+++ b/include/configs/SBx81LIFXCAT.h
@@ -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 */

diff --git a/include/configs/dns325.h b/include/configs/dns325.h
index 2a70db5e9382..8a9591ff29e1 100644
--- a/include/configs/dns325.h
+++ b/include/configs/dns325.h
@@ -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

/*
diff --git a/include/configs/dockstar.h b/include/configs/dockstar.h
index 07cec38b50d0..68afe96239e6 100644
--- a/include/configs/dockstar.h
+++ b/include/configs/dockstar.h
@@ -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 */
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 733020d3e261..2b312e52b135 100644
--- a/include/configs/dreamplug.h
+++ b/include/configs/dreamplug.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 */
diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index ede21a4e2c57..a5f62497a731 100644
--- a/include/configs/ds109.h
+++ b/include/configs/ds109.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 */

diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h
index bc517286b113..c10e991d6589 100644
--- a/include/configs/goflexhome.h
+++ b/include/configs/goflexhome.h
@@ -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 */
diff --git a/include/configs/guruplug.h b/include/configs/guruplug.h
index c4f53e6e4004..b21151e312c9 100644
--- a/include/configs/guruplug.h
+++ b/include/configs/guruplug.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 */

diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 242f92e6fd72..5eeaeadd4bec 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -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 */

diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h
index f719ecb5fe0b..12f8a3c933cc 100644
--- a/include/configs/iconnect.h
+++ b/include/configs/iconnect.h
@@ -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 */

diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h
index db45585ba313..ea3a5215e8c9 100644
--- a/include/configs/lacie_kw.h
+++ b/include/configs/lacie_kw.h
@@ -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

/*
diff --git a/include/configs/nas220.h b/include/configs/nas220.h
index 9676ccc982f5..bfa132dbfe58 100644
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -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 */

diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h
index 76c4aed6fd91..85cbd0bab07d 100644
--- a/include/configs/nsa310s.h
+++ b/include/configs/nsa310s.h
@@ -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 */
diff --git a/include/configs/openrd.h b/include/configs/openrd.h
index ec3a0e0676d7..1d1915a98520 100644
--- a/include/configs/openrd.h
+++ b/include/configs/openrd.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
diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h
index af750e86ee98..c48590123bd2 100644
--- a/include/configs/pogo_e02.h
+++ b/include/configs/pogo_e02.h
@@ -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 */
diff --git a/include/configs/pogo_v4.h b/include/configs/pogo_v4.h
index 016da6d04b0b..5d26a45f1426 100644
--- a/include/configs/pogo_v4.h
+++ b/include/configs/pogo_v4.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 */
diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h
index a228dac2ee92..d4d968285fbd 100644
--- a/include/configs/sheevaplug.h
+++ b/include/configs/sheevaplug.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 */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 24d09c1a4be2..92dec899cad7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -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
--
2.25.1