[PATCH 121/149] global: Migrate CONFIG_SH_ETHER_USE_PORT to CFG

Tom Rini
2022-12-04T15:29:38Z

Perform a simple rename of CONFIG_SH_ETHER_USE_PORT to CFG_SH_ETHER_USE_PORT

Signed-off-by: Tom Rini <trini@konsulko.com>
---
README | 2 +-
drivers/net/sh_eth.c | 6 +++---
include/configs/alt.h | 2 +-
include/configs/condor.h | 2 +-
include/configs/gose.h | 2 +-
include/configs/grpeach.h | 2 +-
include/configs/koelsch.h | 2 +-
include/configs/lager.h | 2 +-
include/configs/porter.h | 2 +-
include/configs/silk.h | 2 +-
include/configs/stout.h | 2 +-
11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README b/README
index 217fbaf55757..a9b225e45ecb 100644
--- a/README
+++ b/README
@@ -541,7 +541,7 @@ The following options need to be configured:
CONFIG_SH_ETHER
Support for Renesas on-chip Ethernet controller

- CONFIG_SH_ETHER_USE_PORT
+ CFG_SH_ETHER_USE_PORT
Define the number of ports to be used

CFG_SH_ETHER_PHY_ADDR
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index 3bf94cb2f7eb..8f162ca58fbb 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -30,8 +30,8 @@

#include "sh_eth.h"

-#ifndef CONFIG_SH_ETHER_USE_PORT
-# error "Please define CONFIG_SH_ETHER_USE_PORT"
+#ifndef CFG_SH_ETHER_USE_PORT
+# error "Please define CFG_SH_ETHER_USE_PORT"
#endif
#ifndef CFG_SH_ETHER_PHY_ADDR
# error "Please define CFG_SH_ETHER_PHY_ADDR"
@@ -693,7 +693,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 = CFG_SH_ETHER_USE_PORT;
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 53c31562a5d0..8f03762583e9 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -21,7 +21,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)

/* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT 0
+#define CFG_SH_ETHER_USE_PORT 0
#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/condor.h b/include/configs/condor.h
index 2c9817cf02c5..50c8d1733838 100644
--- a/include/configs/condor.h
+++ b/include/configs/condor.h
@@ -14,7 +14,7 @@
/* Environment compatibility */

/* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT 0
+#define CFG_SH_ETHER_USE_PORT 0
#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/gose.h b/include/configs/gose.h
index ed7dd70dd964..7ae0726518da 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -20,7 +20,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512u * 1024 * 1024)

/* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT 0
+#define CFG_SH_ETHER_USE_PORT 0
#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h
index 6a11aa61f0fb..8de4a36e931a 100644
--- a/include/configs/grpeach.h
+++ b/include/configs/grpeach.h
@@ -17,7 +17,7 @@
#define CFG_SYS_SDRAM_SIZE (10 * 1024 * 1024)

/* Network interface */
-#define CONFIG_SH_ETHER_USE_PORT 0
+#define CFG_SH_ETHER_USE_PORT 0
#define CFG_SH_ETHER_PHY_ADDR 0
#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_MII
#define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 31d0795f07fb..d47d70178ccd 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -20,7 +20,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)

/* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT 0
+#define CFG_SH_ETHER_USE_PORT 0
#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/lager.h b/include/configs/lager.h
index 991fc9020ee0..2577c7a7da67 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -21,7 +21,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)

/* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT 0
+#define CFG_SH_ETHER_USE_PORT 0
#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/porter.h b/include/configs/porter.h
index 1587c5c5397c..2cb430be8b0d 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -22,7 +22,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (1024u * 1024 * 1024)

/* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT 0
+#define CFG_SH_ETHER_USE_PORT 0
#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/silk.h b/include/configs/silk.h
index 21100c46b1cb..7bed32d8553b 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -22,7 +22,7 @@
#define RCAR_GEN2_UBOOT_SDRAM_SIZE (512 * 1024 * 1024)

/* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT 0
+#define CFG_SH_ETHER_USE_PORT 0
#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
diff --git a/include/configs/stout.h b/include/configs/stout.h
index 51f4420ed6fa..1278ba63f4f3 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -26,7 +26,7 @@
#define CFG_SCIF_A

/* SH Ether */
-#define CONFIG_SH_ETHER_USE_PORT 0
+#define CFG_SH_ETHER_USE_PORT 0
#define CFG_SH_ETHER_PHY_ADDR 0x1
#define CFG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RMII
#define CFG_SH_ETHER_CACHE_WRITEBACK
--
2.25.1