net: Remove more legacy functions

Remove some of the board and arch specific non-DM_ETH helper code.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c
index 25e4b49..c455969 100644 (file)
--- a/arch/arm/cpu/armv7/ls102xa/cpu.c
+++ b/arch/arm/cpu/armv7/ls102xa/cpu.c
@@ -302,15 +302,6 @@ int cpu_mmc_init(struct bd_info *bis)
 }
 #endif
 
-int cpu_eth_init(struct bd_info *bis)
-{
-#if defined(CONFIG_TSEC_ENET) && !defined(CONFIG_DM_ETH)
-       tsec_standard_init(bis);
-#endif
-
-       return 0;
-}
-
 int arch_cpu_init(void)
 {
        void *epu_base = (void *)(CFG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 99413ef..2aeec7d 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -1058,9 +1058,6 @@ int cpu_eth_init(struct bd_info *bis)
 #if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD)
        error = fsl_mc_ldpaa_init(bis);
 #endif
-#ifdef CONFIG_FMAN_ENET
-       fm_standard_init(bis);
-#endif
        return error;
 }
 

diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c
index 8d53189..a6c0635 100644 (file)
--- a/arch/powerpc/cpu/mpc83xx/cpu.c
+++ b/arch/powerpc/cpu/mpc83xx/cpu.c
@@ -180,24 +180,6 @@ void watchdog_reset (void)
 }
 #endif
 
-#ifndef CONFIG_DM_ETH
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-int cpu_eth_init(struct bd_info *bis)
-{
-#if defined(CONFIG_UEC_ETH)
-       uec_standard_init(bis);
-#endif
-
-#if defined(CONFIG_TSEC_ENET)
-       tsec_standard_init(bis);
-#endif
-       return 0;
-}
-#endif /* !CONFIG_DM_ETH */
-
 /*
  * Initializes on-chip MMC controllers.
  * to override, implement board_mmc_init()

diff --git a/arch/powerpc/cpu/mpc8xxx/cpu.c b/arch/powerpc/cpu/mpc8xxx/cpu.c
index 7f20190..73d28f2 100644 (file)
--- a/arch/powerpc/cpu/mpc8xxx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xxx/cpu.c
@@ -343,29 +343,3 @@ int fixup_cpu(void)
 #endif
        return 0;
 }
-
-#ifndef CONFIG_DM_ETH
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-int cpu_eth_init(struct bd_info *bis)
-{
-#if defined(CONFIG_UEC_ETH)
-       uec_standard_init(bis);
-#endif
-
-#if defined(CONFIG_TSEC_ENET) || defined(CONFIG_MPC85XX_FEC)
-       tsec_standard_init(bis);
-#endif
-
-#ifdef CONFIG_FMAN_ENET
-       fm_standard_init(bis);
-#endif
-
-#ifdef CONFIG_VSC9953
-       vsc9953_init(bis);
-#endif
-       return 0;
-}
-#endif

diff --git a/drivers/net/qe/uec.h b/drivers/net/qe/uec.h
index 551d706..4510205 100644 (file)
--- a/drivers/net/qe/uec.h
+++ b/drivers/net/qe/uec.h
@@ -689,5 +689,4 @@ struct uec_priv {
 
 int uec_initialize(struct bd_info *bis, struct uec_inf *uec_info);
 int uec_eth_init(struct bd_info *bis, struct uec_inf *uecs, int num);
-int uec_standard_init(struct bd_info *bis);
 #endif /* __UEC_H__ */

diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h
index 1f03f95..c939caf 100644 (file)
--- a/include/configs/km/km-mpc83xx.h
+++ b/include/configs/km/km-mpc83xx.h
@@ -58,8 +58,3 @@
  * the maximum mapped by the Linux kernel during initialization.
  */
 #define CFG_SYS_BOOTMAPSZ              (8 << 20)
-
-/*
- * QE UEC ethernet configuration
- */
-#define CONFIG_UEC_ETH

diff --git a/include/fm_eth.h b/include/fm_eth.h
index aeb6409..6012a44 100644 (file)
--- a/include/fm_eth.h
+++ b/include/fm_eth.h
@@ -202,7 +202,6 @@ struct memac_mdio_info {
 int fm_tgec_mdio_init(struct bd_info *bis, struct tgec_mdio_info *info);
 int fm_memac_mdio_init(struct bd_info *bis, struct memac_mdio_info *info);
 
-int fm_standard_init(struct bd_info *bis);
 void fman_enet_init(void);
 void fdt_fixup_fman_ethernet(void *fdt);
 phy_interface_t fm_info_get_enet_if(enum fm_port port);

diff --git a/include/netdev.h b/include/netdev.h
index b3f8584..2b4e474 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -70,7 +70,6 @@ int sh_eth_initialize(struct bd_info *bis);
 int skge_initialize(struct bd_info *bis);
 int smc91111_initialize(u8 dev_num, phys_addr_t base_addr);
 int smc911x_initialize(u8 dev_num, phys_addr_t base_addr);
-int uec_standard_init(struct bd_info *bis);
 int uli526x_initialize(struct bd_info *bis);
 int armada100_fec_register(unsigned long base_addr);