summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-12-04 10:13:50 -0500
committerTom Rini <trini@konsulko.com>2022-12-23 10:15:12 -0500
commit7c480bab146f830220f1feef00ad1b9a5a64c6cb (patch)
tree1d0e90a968eccf9dbbc1e6042ee398527fd5b2e1
parentff53ecc3877c6f4b1cc035a44b43b9c50e1fabc8 (diff)
downloadu-boot-7c480bab146f830220f1feef00ad1b9a5a64c6cb.tar.gz
u-boot-7c480bab146f830220f1feef00ad1b9a5a64c6cb.tar.bz2
u-boot-7c480bab146f830220f1feef00ad1b9a5a64c6cb.zip
global: Migrate CONFIG_SH_ETHER_PHY_ADDR to CFG
Perform a simple rename of CONFIG_SH_ETHER_PHY_ADDR to CFG_SH_ETHER_PHY_ADDR Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--README2
-rw-r--r--drivers/net/sh_eth.c6
-rw-r--r--include/configs/alt.h2
-rw-r--r--include/configs/condor.h2
-rw-r--r--include/configs/gose.h2
-rw-r--r--include/configs/grpeach.h2
-rw-r--r--include/configs/koelsch.h2
-rw-r--r--include/configs/lager.h2
-rw-r--r--include/configs/porter.h2
-rw-r--r--include/configs/silk.h2
-rw-r--r--include/configs/stout.h2
11 files changed, 13 insertions, 13 deletions
diff --git a/README b/README
index 5f688d70f3..217fbaf557 100644
--- a/README
+++ b/README
@@ -544,7 +544,7 @@ The following options need to be configured:
CONFIG_SH_ETHER_USE_PORT
Define the number of ports to be used
- CONFIG_SH_ETHER_PHY_ADDR
+ CFG_SH_ETHER_PHY_ADDR
Define the ETH PHY's address
CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 0053733075..3bf94cb2f7 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -33,8 +33,8 @@
#ifndef CONFIG_SH_ETHER_USE_PORT
# error "Please define CONFIG_SH_ETHER_USE_PORT"
#endif
-#ifndef CONFIG_SH_ETHER_PHY_ADDR
-# error "Please define CONFIG_SH_ETHER_PHY_ADDR"
+#ifndef CFG_SH_ETHER_PHY_ADDR
+# error "Please define CFG_SH_ETHER_PHY_ADDR"
#endif
#if defined(CFG_SH_ETHER_CACHE_WRITEBACK) && \
@@ -694,7 +694,7 @@ static int sh_ether_probe(struct udevice *udev)
priv->bus = miiphy_get_dev_by_name(udev->name);
eth->port = CONFIG_SH_ETHER_USE_PORT;
- eth->port_info[eth->port].phy_addr = CONFIG_SH_ETHER_PHY_ADDR;
+ eth->port_info[eth->port].phy_addr = CFG_SH_ETHER_PHY_ADDR;
eth->port_info[eth->port].iobase =
(void __iomem *)(uintptr_t)(BASE_IO_ADDR + 0x800 * eth->port);
diff --git a/include/configs/alt.h b/include/configs/alt.h
index 2b78325273..06ab5ce669 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -22,7 +22,7 @@
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
-#define CONFIG_SH_ETHER_PHY_ADDR 0x1
+#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
#define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 3f99cbf9da..43b88f1272 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -15,7 +15,7 @@
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
-#define CONFIG_SH_ETHER_PHY_ADDR 0x1
+#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
#define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/gose.h b/include/configs/gose.h
index 45a537341b..5184db4106 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -21,7 +21,7 @@
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
-#define CONFIG_SH_ETHER_PHY_ADDR 0x1
+#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
#define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 3fde614070..8ba9b73672 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -18,7 +18,7 @@
/* Network interface */
#define CONFIG_SH_ETHER_USE_PORT 0
-#define CONFIG_SH_ETHER_PHY_ADDR 0
+#define CFG_SH_ETHER_PHY_ADDR 0
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
#define CFG_SH_ETHER_CACHE_WRITEBACK
#define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index b3b6f03e08..2910336def 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -21,7 +21,7 @@
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
-#define CONFIG_SH_ETHER_PHY_ADDR 0x1
+#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
#define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 16d15ccdd9..815239a73b 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -22,7 +22,7 @@
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
-#define CONFIG_SH_ETHER_PHY_ADDR 0x1
+#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
#define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/porter.h b/include/configs/porter.h
index f217141af8..f732aeb47b 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -23,7 +23,7 @@
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
-#define CONFIG_SH_ETHER_PHY_ADDR 0x1
+#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
#define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 09c23d379e..005eed1549 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -23,7 +23,7 @@
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
-#define CONFIG_SH_ETHER_PHY_ADDR 0x1
+#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
#define CFG_SH_ETHER_CACHE_INVALIDATE
diff --git a/include/configs/stout.h b/include/configs/stout.h
index dd44b3e6d0..cf90e4d464 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -27,7 +27,7 @@
/* SH Ether */
#define CONFIG_SH_ETHER_USE_PORT 0
-#define CONFIG_SH_ETHER_PHY_ADDR 0x1
+#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
#define CFG_SH_ETHER_CACHE_INVALIDATE