summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-12-04 18:03:52 +0300
committerTom Rini <trini@konsulko.com>2022-12-23 18:09:42 +0300
commit4daffb58e6ccd36f9fdab8ef45cde8548226c4f6 (patch)
treeacb406edf9a378abc9a5b77c06e4816747642c30
parent2aac334a9b57df2653da3a5d6169c473c760a14d (diff)
downloadu-boot-4daffb58e6ccd36f9fdab8ef45cde8548226c4f6.tar.xz
global: Migrate CONFIG_FEC_ENET_DEV to CFG
Perform a simple rename of CONFIG_FEC_ENET_DEV to CFG_FEC_ENET_DEV Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c2
-rw-r--r--board/freescale/mx6ullevk/mx6ullevk.c2
-rw-r--r--board/seeed/npi_imx6ull/npi_imx6ull.c2
-rw-r--r--board/variscite/dart_6ul/dart_6ul.c2
-rw-r--r--include/configs/capricorn-common.h2
-rw-r--r--include/configs/dart_6ul.h2
-rw-r--r--include/configs/liteboard.h2
-rw-r--r--include/configs/mx6ul_14x14_evk.h6
-rw-r--r--include/configs/mx6ullevk.h2
-rw-r--r--include/configs/npi_imx6ull.h2
-rw-r--r--include/configs/xpress.h2
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 1eec048a66..570b5014db 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 86c11c7bd3..e247380647 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 eb9ee555c8..c610d2c306 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 7326daa179..98d8d1c312 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 a8273a7fcd..63afa6e189 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 323703ac5c..c2ed9c7c56 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 938ab5ade9..7200c69bd9 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 90c7884687..efc599f37a 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 4a27fd2290..58d1a744ae 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 a12e34b6e6..979512c0a0 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 0d72008bb4..13f0ee62b8 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 \