[PATCH 027/149] global: Migrate CONFIG_FEC_ENET_DEV to CFG

Tom Rini
2022-12-04T15:11:55Z

Perform a simple rename of CONFIG_FEC_ENET_DEV to CFG_FEC_ENET_DEV

Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 2 +-
board/freescale/mx6ullevk/mx6ullevk.c | 2 +-
board/seeed/npi_imx6ull/npi_imx6ull.c | 2 +-
board/variscite/dart_6ul/dart_6ul.c | 2 +-
include/configs/capricorn-common.h | 2 +-
include/configs/dart_6ul.h | 2 +-
include/configs/liteboard.h | 2 +-
include/configs/mx6ul_14x14_evk.h | 6 +++---
include/configs/mx6ullevk.h | 2 +-
include/configs/npi_imx6ull.h | 2 +-
include/configs/xpress.h | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 1eec048a66fa..570b5014dbb1 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -281,7 +281,7 @@ int board_init(void)
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

#ifdef CONFIG_FEC_MXC
- setup_fec(CONFIG_FEC_ENET_DEV);
+ setup_fec(CFG_FEC_ENET_DEV);
#endif

#ifdef CONFIG_USB_EHCI_MX6
diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c
index 86c11c7bd3a5..e24738064757 100644
--- a/board/freescale/mx6ullevk/mx6ullevk.c
+++ b/board/freescale/mx6ullevk/mx6ullevk.c
@@ -110,7 +110,7 @@ int board_init(void)
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

#ifdef CONFIG_FEC_MXC
- setup_fec(CONFIG_FEC_ENET_DEV);
+ setup_fec(CFG_FEC_ENET_DEV);
#endif

return 0;
diff --git a/board/seeed/npi_imx6ull/npi_imx6ull.c b/board/seeed/npi_imx6ull/npi_imx6ull.c
index eb9ee555c854..c610d2c30696 100644
--- a/board/seeed/npi_imx6ull/npi_imx6ull.c
+++ b/board/seeed/npi_imx6ull/npi_imx6ull.c
@@ -100,7 +100,7 @@ int board_init(void)
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

#ifdef CONFIG_FEC_MXC
- setup_fec(CONFIG_FEC_ENET_DEV);
+ setup_fec(CFG_FEC_ENET_DEV);
#endif

return 0;
diff --git a/board/variscite/dart_6ul/dart_6ul.c b/board/variscite/dart_6ul/dart_6ul.c
index 7326daa1798d..98d8d1c31205 100644
--- a/board/variscite/dart_6ul/dart_6ul.c
+++ b/board/variscite/dart_6ul/dart_6ul.c
@@ -147,7 +147,7 @@ int board_init(void)
gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

#ifdef CONFIG_FEC_MXC
- setup_fec(CONFIG_FEC_ENET_DEV);
+ setup_fec(CFG_FEC_ENET_DEV);
#endif

#ifdef CONFIG_NAND_MXS
diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index a8273a7fcd8d..63afa6e18969 100644
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -19,7 +19,7 @@
#endif /* CONFIG_SPL_BUILD */

/* ENET1 connects to base board and MUX with ESAI */
-#define CONFIG_FEC_ENET_DEV 1
+#define CFG_FEC_ENET_DEV 1
#define CONFIG_FEC_MXC_PHYADDR 0x0

/* EEPROM */
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 323703ac5c90..c2ed9c7c56af 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -18,7 +18,7 @@
#endif

#ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV 0
+#define CFG_FEC_ENET_DEV 0
#endif

/* Environment settings */
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 938ab5ade9a7..7200c69bd9e6 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -100,7 +100,7 @@
#endif

#ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV 0
+#define CFG_FEC_ENET_DEV 0

#define CONFIG_FEC_MXC_PHYADDR 0x0
#endif
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 90c788468710..efc599f37a6d 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -121,11 +121,11 @@
#endif

#ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV 1
+#define CFG_FEC_ENET_DEV 1

-#if (CONFIG_FEC_ENET_DEV == 0)
+#if (CFG_FEC_ENET_DEV == 0)
#define CONFIG_FEC_MXC_PHYADDR 0x2
-#elif (CONFIG_FEC_ENET_DEV == 1)
+#elif (CFG_FEC_ENET_DEV == 1)
#define CONFIG_FEC_MXC_PHYADDR 0x1
#endif
#endif
diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 4a27fd22902b..58d1a744ae99 100644
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -109,7 +109,7 @@
/* environment organization */

#ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_ENET_DEV 1
+#define CFG_FEC_ENET_DEV 1
#endif

#endif
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index a12e34b6e607..979512c0a095 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -36,7 +36,7 @@
#define CONFIG_FEC_MXC_PHYADDR 0x1
#endif

-#define CONFIG_FEC_ENET_DEV 1
+#define CFG_FEC_ENET_DEV 1

#define CFG_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200n8\0" \
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 0d72008bb466..13f0ee62b89f 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -31,7 +31,7 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0

-#define CONFIG_FEC_ENET_DEV 0
+#define CFG_FEC_ENET_DEV 0
#define CONFIG_FEC_MXC_PHYADDR 0x0

#define CFG_EXTRA_ENV_SETTINGS \
--
2.25.1