Remove CONFIG_HAS_ETH0 et al symbols

This converts removes the following symbols:
   CONFIG_HAS_ETH0
   CONFIG_HAS_ETH1
   CONFIG_HAS_ETH2
   CONFIG_HAS_ETH3

This is because at this point, only the ids8313 platform was using the
code which was controlled by these symbols.  In turn, this code already
performs error checking on being able to perform the device tree fixup.
Rather than convert these to Kconfig for a single platform, update the
code to not need these checks and remove them from all the platforms
they were unused on.

Reviewed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c
index 3393ad562e8dd35f79f1778a5ec0343306764fbf..33b2151f878c4ccc9b0c8b79f273f1c73d998007 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/fdt.c
+++ b/arch/powerpc/cpu/mpc83xx/fdt.c
@@ -51,9 +51,6 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
                 REVID_MAJOR(spridr) >= 2)
                fdt_fixup_crypto_node(blob, 0x0204);
 
-#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\
-    defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) ||\
-    defined(CONFIG_HAS_ETH4) || defined(CONFIG_HAS_ETH5)
 #ifdef CONFIG_ARCH_MPC8313
        /*
        * mpc8313e erratum IPIC1 swapped TSEC interrupt ID numbers on rev. 1
@@ -66,7 +63,6 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
 
                nodeoffset = fdt_path_offset(blob, "/aliases");
                if (nodeoffset >= 0) {
-#if defined(CONFIG_HAS_ETH0)
                        prop = fdt_getprop(blob, nodeoffset, "ethernet0", NULL);
                        if (prop) {
                                u32 tmp[] = { 32, 0x8, 33, 0x8, 34, 0x8 };
@@ -78,8 +74,6 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
                                        fdt_setprop(blob, path, "interrupts",
                                                    &tmp, sizeof(tmp));
                        }
-#endif
-#if defined(CONFIG_HAS_ETH1)
                        prop = fdt_getprop(blob, nodeoffset, "ethernet1", NULL);
                        if (prop) {
                                u32 tmp[] = { 35, 0x8, 36, 0x8, 37, 0x8 };
@@ -91,10 +85,8 @@ void ft_cpu_setup(void *blob, struct bd_info *bd)
                                        fdt_setprop(blob, path, "interrupts",
                                                    &tmp, sizeof(tmp));
                        }
-#endif
                }
        }
-#endif
 #endif
 
        do_fixup_by_prop_u32(blob, "device_type", "cpu", 4,

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index e6f42556ffb3c6b0831372f07432b3f1362dc1ca..76c85a7f5c3854e2a95fd67b103b1705854e20ba 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -22,7 +22,6 @@
 #      define CONFIG_SYS_DISCOVER_PHY
 #      define CONFIG_SYS_RX_ETH_BUFFER 8
 #      define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-#      define CONFIG_HAS_ETH1
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY
 #              define FECDUPLEX        FULL

diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index d95dd8ca860bc7ff2fbdae925883f2c5dde53570..e9057ffd95512db991afd3df65382200357dc458 100644 (file)
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -40,7 +40,6 @@
 #define CONFIG_SYS_DISCOVER_PHY
 #define CONFIG_SYS_RX_ETH_BUFFER       8
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-#define CONFIG_HAS_ETH1
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #ifndef CONFIG_SYS_DISCOVER_PHY
 #define FECDUPLEX              FULL

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index ec701867a8065ec065cbbc1888cac0e39e8ba372..06eb03b2b8eef11725527bd94a31420ff599f5c3 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -31,7 +31,6 @@
 #      define CONFIG_SYS_TX_ETH_BUFFER 8
 #      define CONFIG_SYS_FEC_BUF_USE_SRAM
 #      define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-#      define CONFIG_HAS_ETH1
 
 /* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
 #      ifndef CONFIG_SYS_DISCOVER_PHY

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index 8bbc5f47746683016b8fb52e0e7b3dae3c481584..39c1e846b3566799d2db81bf40d690f0a8467736 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -250,7 +250,6 @@
 #define CONFIG_TSEC1
 
 #ifdef CONFIG_TSEC1
-#define CONFIG_HAS_ETH0
 #define CONFIG_TSEC1_NAME              "TSEC0"
 #define CONFIG_SYS_TSEC1_OFFSET                0x24000
 #define TSEC1_PHY_ADDR                 2
@@ -259,7 +258,6 @@
 #endif
 
 #ifdef CONFIG_TSEC2
-#define CONFIG_HAS_ETH1
 #define CONFIG_TSEC2_NAME              "TSEC1"
 #define CONFIG_SYS_TSEC2_OFFSET                0x25000
 #define TSEC2_PHY_ADDR                 0x1c

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 093061b52ffca0453f7344d9b4ab48b1781ef960..e91f9c2912fc8dcc70bea3f462126facaa1c7b60 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -388,12 +388,6 @@
 /*
  * Environment Configuration
  */
-#if defined(CONFIG_TSEC_ENET)
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-#define CONFIG_HAS_ETH2
-#define CONFIG_HAS_ETH3
-#endif
 
 #define CONFIG_IPADDR   192.168.1.253
 

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 8fd9eb7bfa643ca1a8d6863bf3420bd24c718f99..d36c1c1229eeb7e5be756037cebaa263335995cc 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -598,12 +598,6 @@ extern unsigned long get_sdram_size(void);
  * Environment Configuration
  */
 
-#if defined(CONFIG_TSEC_ENET)
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-#define CONFIG_HAS_ETH2
-#endif
-
 #define CONFIG_ROOTPATH                "/opt/nfsroot"
 #define CONFIG_UBOOTPATH       u-boot.bin/* U-Boot image on TFTP server */
 

diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index 7a08c334eb4a22f95b5846bd9db0a0d8d62927b4..f5d49d28ee1e20a353fa81ceca2a17304f4d3e70 100644 (file)
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -77,9 +77,6 @@
  * Environment Configuration
  */
 
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-
 /* TODO: Turn into string option and migrate to Kconfig */
 #define CONFIG_HOSTNAME                "gazerbeam"
 #define CONFIG_ROOTPATH                "/opt/nfsroot"

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 48d2efb88789f672c5e6b51e91520a0a2ff63ea6..7e90b1f78d99e68809ed692ad4920f815e556a11 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -160,7 +160,6 @@
  * Ethernet setup
  */
 #ifdef CONFIG_TSEC1
-#define CONFIG_HAS_ETH0
 #define CONFIG_TSEC1_NAME              "TSEC0"
 #define CONFIG_SYS_TSEC1_OFFSET        0x24000
 #define TSEC1_PHY_ADDR                 0x1
@@ -169,7 +168,6 @@
 #endif
 
 #ifdef CONFIG_TSEC2
-#define CONFIG_HAS_ETH1
 #define CONFIG_TSEC2_NAME              "TSEC1"
 #define CONFIG_SYS_TSEC2_OFFSET        0x25000
 #define TSEC2_PHY_ADDR                 0x3

diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index b89977584014edc3b7338539ce5fb674fbe53f32..9d732c515e40383a9665da6003510a2098cd2689 100644 (file)
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -12,8 +12,6 @@
 #include <asm/arch/imx-regs.h>
 #include <config_distro_bootcmd.h>
 
-#define CONFIG_HAS_ETH1
-
 #define CONFIG_SYS_BOOTM_LEN           (32 * SZ_1M)
 
 #define CONFIG_SPL_MAX_SIZE            (152 * 1024)

diff --git a/include/configs/km/km-mpc8309.h b/include/configs/km/km-mpc8309.h
index 98204bd3c692e5d67d5c4d9d8bc26cea37021f99..ab629be380e653eb3295c160d15fbfb939c2c23a 100644 (file)
--- a/include/configs/km/km-mpc8309.h
+++ b/include/configs/km/km-mpc8309.h
@@ -115,7 +115,6 @@
 /* EEprom support */
 
 /* ethernet port connected to piggy (UEC2) */
-#define CONFIG_HAS_ETH1
 #define CONFIG_UEC_ETH2
 #define CONFIG_SYS_UEC2_UCC_NUM                2       /* UCC3 */
 #define CONFIG_SYS_UEC2_RX_CLK         QE_CLK_NONE /* not used in RMII Mode */

diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 7c979c5fa95c82ccce6cc488252bd545274314f0..9bf91a96ce9f65fa3935da75f3b64e80b692781b 100644 (file)
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -108,10 +108,6 @@
        "unlock=yes\0"                                                   \
        ""
 
-#if defined(CONFIG_UEC_ETH)
-#define CONFIG_HAS_ETH0
-#endif
-
 /*
  * QE UEC ethernet configuration
  */

diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h
index 810eee895b8056e80e556a7a50e342e1fabe2ff3..0bbab81203c66126fb0facd0c3fd3b8281d536f2 100644 (file)
--- a/include/configs/ls1021aiot.h
+++ b/include/configs/ls1021aiot.h
@@ -106,10 +106,6 @@
 #define TSEC2_PHYIDX                   0
 
 #define CONFIG_ETHPRIME                        "eTSEC2"
-
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-#define CONFIG_HAS_ETH2
 #endif
 
 /* PCIe */

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 27a074c745bdc85f0234ac519d42f3722f89c516..20560ee0f11e935154fb1aa2c2b98a43c6c62c5f 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -338,10 +338,6 @@
 
 #define CONFIG_ETHPRIME                        "eTSEC1"
 
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-#define CONFIG_HAS_ETH2
-
 #define CONFIG_FSL_SGMII_RISER         1
 #define SGMII_RISER_PHY_OFFSET         0x1b
 

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 926318993ae0921d8e70c94285451b299bcf0cd8..33f99fdf5d3a4acb6f77c89ad3583feb3dd78a48 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -487,10 +487,6 @@
 #define TSEC3_PHYIDX   0
 
 #define CONFIG_ETHPRIME        "eTSEC1"
-
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-#define CONFIG_HAS_ETH2
 #endif /* CONFIG_TSEC_ENET */
 
 /*

diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 4d562d49c97e54c1ef15f95732aaf7ac11b841e0..8ac98eece72436d1f6b32328efc16e7455c016c5 100644 (file)
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -157,9 +157,6 @@
 /* Options are: TSEC[0,1] */
 #define CONFIG_ETHPRIME                "TSEC0"
 
-#define CONFIG_HAS_ETH0
-#define CONFIG_HAS_ETH1
-
 /*
  * Environment
  */