board: freescale: t208xrdb: remove the legacy non-DM_ETH code

Both DM_ETH and DM_PCI are enabled for the T2080RDB board. Remove the
board_eth_init() callback and the non-DM_ETH code paths since they are not
needed anymore.

Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/board/freescale/t208xrdb/eth_t208xrdb.c b/board/freescale/t208xrdb/eth_t208xrdb.c
index b0ff4b1f375a9d53ccdfd0a622589c71daa5311c..4b44b1617d6cdcfa4aab3df51d28b9081e418887 100644 (file)
--- a/board/freescale/t208xrdb/eth_t208xrdb.c
+++ b/board/freescale/t208xrdb/eth_t208xrdb.c
@@ -26,85 +26,6 @@
 #include <fsl_dtsec.h>
 #include <asm/fsl_serdes.h>
 
-int board_eth_init(struct bd_info *bis)
-{
-#if defined(CONFIG_FMAN_ENET)
-       int i, interface;
-       struct memac_mdio_info dtsec_mdio_info;
-       struct memac_mdio_info tgec_mdio_info;
-       struct mii_dev *dev;
-       ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
-       u32 srds_s1;
-
-       srds_s1 = in_be32(&gur->rcwsr[4]) &
-                                       FSL_CORENET2_RCWSR4_SRDS1_PRTCL;
-       srds_s1 >>= FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT;
-
-       dtsec_mdio_info.regs =
-               (struct memac_mdio_controller *)CONFIG_SYS_FM1_DTSEC_MDIO_ADDR;
-
-       dtsec_mdio_info.name = DEFAULT_FM_MDIO_NAME;
-
-       /* Register the 1G MDIO bus */
-       fm_memac_mdio_init(bis, &dtsec_mdio_info);
-
-       tgec_mdio_info.regs =
-               (struct memac_mdio_controller *)CONFIG_SYS_FM1_TGEC_MDIO_ADDR;
-       tgec_mdio_info.name = DEFAULT_FM_TGEC_MDIO_NAME;
-
-       /* Register the 10G MDIO bus */
-       fm_memac_mdio_init(bis, &tgec_mdio_info);
-
-       /* Set the two on-board RGMII PHY address */
-       fm_info_set_phy_address(FM1_DTSEC3, RGMII_PHY1_ADDR);
-       fm_info_set_phy_address(FM1_DTSEC4, RGMII_PHY2_ADDR);
-
-       switch (srds_s1) {
-       case 0x66:
-       case 0x6b:
-               fm_info_set_phy_address(FM1_10GEC1, CORTINA_PHY_ADDR1);
-               fm_info_set_phy_address(FM1_10GEC2, CORTINA_PHY_ADDR2);
-               fm_info_set_phy_address(FM1_10GEC3, FM1_10GEC3_PHY_ADDR);
-               fm_info_set_phy_address(FM1_10GEC4, FM1_10GEC4_PHY_ADDR);
-               break;
-       default:
-               printf("SerDes1 protocol 0x%x is not supported on T208xRDB\n",
-                      srds_s1);
-               break;
-       }
-
-       for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++) {
-               interface = fm_info_get_enet_if(i);
-               switch (interface) {
-               case PHY_INTERFACE_MODE_RGMII:
-               case PHY_INTERFACE_MODE_RGMII_TXID:
-               case PHY_INTERFACE_MODE_RGMII_RXID:
-               case PHY_INTERFACE_MODE_RGMII_ID:
-                       dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
-                       fm_info_set_mdio(i, dev);
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       for (i = FM1_10GEC1; i < FM1_10GEC1 + CONFIG_SYS_NUM_FM1_10GEC; i++) {
-               switch (fm_info_get_enet_if(i)) {
-               case PHY_INTERFACE_MODE_XGMII:
-                       dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME);
-                       fm_info_set_mdio(i, dev);
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       cpu_eth_init(bis);
-#endif /* CONFIG_FMAN_ENET */
-
-       return pci_eth_init(bis);
-}
-
 /* Disable the MAC5 and MAC6 "fsl,fman-memac" nodes and the two
  * "fsl,dpa-ethernet" nodes that reference them.
  */

diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c
index 7ccb205c6473c716db3c68bc5f2f852611ddd933..35f5dff4664509168f127c823055a2f338fb5488 100644 (file)
--- a/board/freescale/t208xrdb/t208xrdb.c
+++ b/board/freescale/t208xrdb/t208xrdb.c
@@ -136,11 +136,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
        fsl_fdt_fixup_dr_usb(blob, bd);
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-#ifndef CONFIG_DM_ETH
-       fdt_fixup_fman_ethernet(blob);
-#else
        fdt_fixup_board_fman_ethernet(blob);
-#endif
        fdt_fixup_board_enet(blob);
 #endif