pico-imx7d: Convert to DM_ETH
diff mbox series

Message ID 20191208170232.24803-2-offougajoris@gmail.com
State Changes Requested
Delegated to: Stefano Babic
Headers show
Series
  • pico-imx7d: Convert to DM_ETH
Related show

Commit Message

Joris OFFOUGA Dec. 8, 2019, 5:02 p.m. UTC
Signed-off-by: Joris Offouga <offougajoris@gmail.com>
---
 board/technexion/pico-imx7d/pico-imx7d.c | 46 ------------------------
 configs/pico-dwarf-imx7d_defconfig       |  5 +++
 configs/pico-hobbit-imx7d_defconfig      |  5 +++
 configs/pico-imx7d_bl33_defconfig        |  5 +++
 configs/pico-imx7d_defconfig             |  5 +++
 configs/pico-nymph-imx7d_defconfig       |  5 +++
 configs/pico-pi-imx7d_defconfig          |  5 +++
 include/configs/pico-imx7d.h             | 11 ------
 8 files changed, 30 insertions(+), 57 deletions(-)

Comments

Otavio Salvador Dec. 8, 2019, 5:44 p.m. UTC | #1
On Sun, Dec 8, 2019 at 2:03 PM Joris Offouga <offougajoris@gmail.com> wrote:
>
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>

Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
Stefano Babic Dec. 28, 2019, 10:49 a.m. UTC | #2
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
Stefano Babic Dec. 28, 2019, 11:31 a.m. UTC | #3
Hi Joris,



On 08/12/19 18:02, Joris Offouga wrote:
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> ---
>  board/technexion/pico-imx7d/pico-imx7d.c | 46 ------------------------
>  configs/pico-dwarf-imx7d_defconfig       |  5 +++
>  configs/pico-hobbit-imx7d_defconfig      |  5 +++
>  configs/pico-imx7d_bl33_defconfig        |  5 +++
>  configs/pico-imx7d_defconfig             |  5 +++
>  configs/pico-nymph-imx7d_defconfig       |  5 +++
>  configs/pico-pi-imx7d_defconfig          |  5 +++
>  include/configs/pico-imx7d.h             | 11 ------
>  8 files changed, 30 insertions(+), 57 deletions(-)
> 

I get build errors with pico-imx7d_bl33.

	https://travis-ci.org/sbabic/u-boot-imx/jobs/630056283


 Could you take a look, please ?

Best regards,
Stefano

> diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
> index bcfc7d361e..b7ca2e1315 100644
> --- a/board/technexion/pico-imx7d/pico-imx7d.c
> +++ b/board/technexion/pico-imx7d/pico-imx7d.c
> @@ -16,7 +16,6 @@
>  #include <common.h>
>  #include <i2c.h>
>  #include <miiphy.h>
> -#include <netdev.h>
>  #include <power/pmic.h>
>  #include <power/pfuze3000_pmic.h>
>  #include "../../freescale/common/pfuze.h"
> @@ -26,11 +25,6 @@ DECLARE_GLOBAL_DATA_PTR;
>  #define UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM | \
>  	PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
>  
> -#define ENET_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
> -#define ENET_PAD_CTRL_MII  (PAD_CTL_DSE_3P3V_32OHM)
> -
> -#define ENET_RX_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
> -
>  #define I2C_PAD_CTRL    (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
>  	PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
>  
> @@ -123,44 +117,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
>  };
>  
>  #ifdef CONFIG_FEC_MXC
> -static iomux_v3_cfg_t const fec1_pads[] = {
> -	MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
> -	MX7D_PAD_SD2_WP__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
> -	MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> -	MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
> -	MX7D_PAD_SD3_STROBE__GPIO6_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
> -	MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
> -};
> -
> -#define FEC1_RST_GPIO	IMX_GPIO_NR(6, 11)
> -
> -static void setup_iomux_fec(void)
> -{
> -	imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
> -	gpio_request(FEC1_RST_GPIO, "phy_rst");
> -	gpio_direction_output(FEC1_RST_GPIO, 0);
> -	udelay(500);
> -	gpio_set_value(FEC1_RST_GPIO, 1);
> -}
> -
> -int board_eth_init(bd_t *bis)
> -{
> -	setup_iomux_fec();
> -
> -	return fecmxc_initialize_multi(bis, 0,
> -		CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
> -}
> -
>  static int setup_fec(void)
>  {
>  	struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs
> @@ -235,9 +191,7 @@ int board_init(void)
>  	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
>  
>  #ifdef CONFIG_DM_VIDEO
> -
>  	setup_lcd();
> -
>  #endif
>  #ifdef CONFIG_FEC_MXC
>  	setup_fec();
> diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig
> index 94d73ee051..2437a64dd0 100644
> --- a/configs/pico-dwarf-imx7d_defconfig
> +++ b/configs/pico-dwarf-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_FSL_USDHC=y
>  CONFIG_MTD=y
>  CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
>  CONFIG_MII=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
> index ef86b0cd66..3467d4c2e4 100644
> --- a/configs/pico-hobbit-imx7d_defconfig
> +++ b/configs/pico-hobbit-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_FSL_USDHC=y
>  CONFIG_MTD=y
>  CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
>  CONFIG_MII=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig
> index 51d3514072..49a4e1b0c1 100644
> --- a/configs/pico-imx7d_bl33_defconfig
> +++ b/configs/pico-imx7d_bl33_defconfig
> @@ -50,6 +50,11 @@ CONFIG_DM_MMC=y
>  CONFIG_FSL_USDHC=y
>  CONFIG_MTD=y
>  CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
>  CONFIG_MII=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
> index bf4d56ec2c..a1975b9d56 100644
> --- a/configs/pico-imx7d_defconfig
> +++ b/configs/pico-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_FSL_USDHC=y
>  CONFIG_MTD=y
>  CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
>  CONFIG_MII=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig
> index 94d73ee051..2437a64dd0 100644
> --- a/configs/pico-nymph-imx7d_defconfig
> +++ b/configs/pico-nymph-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_FSL_USDHC=y
>  CONFIG_MTD=y
>  CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
>  CONFIG_MII=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
> index c6f5b872c3..f1e439602b 100644
> --- a/configs/pico-pi-imx7d_defconfig
> +++ b/configs/pico-pi-imx7d_defconfig
> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>  CONFIG_FSL_USDHC=y
>  CONFIG_MTD=y
>  CONFIG_PHYLIB=y
> +CONFIG_PHY_ATHEROS=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> +CONFIG_RGMII=y
>  CONFIG_MII=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_IMX7=y
> diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
> index 1d0df9dd44..4dc206566e 100644
> --- a/include/configs/pico-imx7d.h
> +++ b/include/configs/pico-imx7d.h
> @@ -29,17 +29,6 @@
>  
>  #define CONFIG_MXC_UART_BASE		UART5_IPS_BASE_ADDR
>  
> -/* Network */
> -#define CONFIG_FEC_MXC
> -#define CONFIG_FEC_XCV_TYPE		RGMII
> -#define CONFIG_ETHPRIME			"FEC"
> -#define CONFIG_FEC_MXC_PHYADDR		1
> -
> -#define CONFIG_PHY_ATHEROS
> -
> -/* ENET1 */
> -#define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
> -
>  /* MMC Config */
>  #define CONFIG_SYS_FSL_ESDHC_ADDR	0
>  
>
Joris OFFOUGA Jan. 4, 2020, 12:03 p.m. UTC | #4
Hi Stefano,

Sorry for the delay,

Le 28/12/2019 à 12:31, Stefano Babic a écrit :
> Hi Joris,
>
>
>
> On 08/12/19 18:02, Joris Offouga wrote:
>> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
>> ---
>>   board/technexion/pico-imx7d/pico-imx7d.c | 46 ------------------------
>>   configs/pico-dwarf-imx7d_defconfig       |  5 +++
>>   configs/pico-hobbit-imx7d_defconfig      |  5 +++
>>   configs/pico-imx7d_bl33_defconfig        |  5 +++
>>   configs/pico-imx7d_defconfig             |  5 +++
>>   configs/pico-nymph-imx7d_defconfig       |  5 +++
>>   configs/pico-pi-imx7d_defconfig          |  5 +++
>>   include/configs/pico-imx7d.h             | 11 ------
>>   8 files changed, 30 insertions(+), 57 deletions(-)
>>
> I get build errors with pico-imx7d_bl33.
>
> 	https://travis-ci.org/sbabic/u-boot-imx/jobs/630056283
>
>
>   Could you take a look, please ?

I tried to correct the compilation error but I did not find good ways to 
do it, I suggest you remove the usb ethernet support from the 
configuration :

-CONFIG_USB_ETHER=y
-CONFIG_USB_ETH_CDC=y
-CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"

If you agree I send V2

Best regards,

Joris

>
> Best regards,
> Stefano
>
>> diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
>> index bcfc7d361e..b7ca2e1315 100644
>> --- a/board/technexion/pico-imx7d/pico-imx7d.c
>> +++ b/board/technexion/pico-imx7d/pico-imx7d.c
>> @@ -16,7 +16,6 @@
>>   #include <common.h>
>>   #include <i2c.h>
>>   #include <miiphy.h>
>> -#include <netdev.h>
>>   #include <power/pmic.h>
>>   #include <power/pfuze3000_pmic.h>
>>   #include "../../freescale/common/pfuze.h"
>> @@ -26,11 +25,6 @@ DECLARE_GLOBAL_DATA_PTR;
>>   #define UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM | \
>>   	PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
>>   
>> -#define ENET_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
>> -#define ENET_PAD_CTRL_MII  (PAD_CTL_DSE_3P3V_32OHM)
>> -
>> -#define ENET_RX_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
>> -
>>   #define I2C_PAD_CTRL    (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
>>   	PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
>>   
>> @@ -123,44 +117,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
>>   };
>>   
>>   #ifdef CONFIG_FEC_MXC
>> -static iomux_v3_cfg_t const fec1_pads[] = {
>> -	MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
>> -	MX7D_PAD_SD2_WP__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
>> -	MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>> -	MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>> -	MX7D_PAD_SD3_STROBE__GPIO6_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
>> -	MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
>> -};
>> -
>> -#define FEC1_RST_GPIO	IMX_GPIO_NR(6, 11)
>> -
>> -static void setup_iomux_fec(void)
>> -{
>> -	imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
>> -	gpio_request(FEC1_RST_GPIO, "phy_rst");
>> -	gpio_direction_output(FEC1_RST_GPIO, 0);
>> -	udelay(500);
>> -	gpio_set_value(FEC1_RST_GPIO, 1);
>> -}
>> -
>> -int board_eth_init(bd_t *bis)
>> -{
>> -	setup_iomux_fec();
>> -
>> -	return fecmxc_initialize_multi(bis, 0,
>> -		CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
>> -}
>> -
>>   static int setup_fec(void)
>>   {
>>   	struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs
>> @@ -235,9 +191,7 @@ int board_init(void)
>>   	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
>>   
>>   #ifdef CONFIG_DM_VIDEO
>> -
>>   	setup_lcd();
>> -
>>   #endif
>>   #ifdef CONFIG_FEC_MXC
>>   	setup_fec();
>> diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig
>> index 94d73ee051..2437a64dd0 100644
>> --- a/configs/pico-dwarf-imx7d_defconfig
>> +++ b/configs/pico-dwarf-imx7d_defconfig
>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>   CONFIG_FSL_USDHC=y
>>   CONFIG_MTD=y
>>   CONFIG_PHYLIB=y
>> +CONFIG_PHY_ATHEROS=y
>> +CONFIG_DM_ETH=y
>> +CONFIG_DM_MDIO=y
>> +CONFIG_FEC_MXC=y
>> +CONFIG_RGMII=y
>>   CONFIG_MII=y
>>   CONFIG_PINCTRL=y
>>   CONFIG_PINCTRL_IMX7=y
>> diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
>> index ef86b0cd66..3467d4c2e4 100644
>> --- a/configs/pico-hobbit-imx7d_defconfig
>> +++ b/configs/pico-hobbit-imx7d_defconfig
>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>   CONFIG_FSL_USDHC=y
>>   CONFIG_MTD=y
>>   CONFIG_PHYLIB=y
>> +CONFIG_PHY_ATHEROS=y
>> +CONFIG_DM_ETH=y
>> +CONFIG_DM_MDIO=y
>> +CONFIG_FEC_MXC=y
>> +CONFIG_RGMII=y
>>   CONFIG_MII=y
>>   CONFIG_PINCTRL=y
>>   CONFIG_PINCTRL_IMX7=y
>> diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig
>> index 51d3514072..49a4e1b0c1 100644
>> --- a/configs/pico-imx7d_bl33_defconfig
>> +++ b/configs/pico-imx7d_bl33_defconfig
>> @@ -50,6 +50,11 @@ CONFIG_DM_MMC=y
>>   CONFIG_FSL_USDHC=y
>>   CONFIG_MTD=y
>>   CONFIG_PHYLIB=y
>> +CONFIG_PHY_ATHEROS=y
>> +CONFIG_DM_ETH=y
>> +CONFIG_DM_MDIO=y
>> +CONFIG_FEC_MXC=y
>> +CONFIG_RGMII=y
>>   CONFIG_MII=y
>>   CONFIG_PINCTRL=y
>>   CONFIG_PINCTRL_IMX7=y
>> diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
>> index bf4d56ec2c..a1975b9d56 100644
>> --- a/configs/pico-imx7d_defconfig
>> +++ b/configs/pico-imx7d_defconfig
>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>   CONFIG_FSL_USDHC=y
>>   CONFIG_MTD=y
>>   CONFIG_PHYLIB=y
>> +CONFIG_PHY_ATHEROS=y
>> +CONFIG_DM_ETH=y
>> +CONFIG_DM_MDIO=y
>> +CONFIG_FEC_MXC=y
>> +CONFIG_RGMII=y
>>   CONFIG_MII=y
>>   CONFIG_PINCTRL=y
>>   CONFIG_PINCTRL_IMX7=y
>> diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig
>> index 94d73ee051..2437a64dd0 100644
>> --- a/configs/pico-nymph-imx7d_defconfig
>> +++ b/configs/pico-nymph-imx7d_defconfig
>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>   CONFIG_FSL_USDHC=y
>>   CONFIG_MTD=y
>>   CONFIG_PHYLIB=y
>> +CONFIG_PHY_ATHEROS=y
>> +CONFIG_DM_ETH=y
>> +CONFIG_DM_MDIO=y
>> +CONFIG_FEC_MXC=y
>> +CONFIG_RGMII=y
>>   CONFIG_MII=y
>>   CONFIG_PINCTRL=y
>>   CONFIG_PINCTRL_IMX7=y
>> diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
>> index c6f5b872c3..f1e439602b 100644
>> --- a/configs/pico-pi-imx7d_defconfig
>> +++ b/configs/pico-pi-imx7d_defconfig
>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>   CONFIG_FSL_USDHC=y
>>   CONFIG_MTD=y
>>   CONFIG_PHYLIB=y
>> +CONFIG_PHY_ATHEROS=y
>> +CONFIG_DM_ETH=y
>> +CONFIG_DM_MDIO=y
>> +CONFIG_FEC_MXC=y
>> +CONFIG_RGMII=y
>>   CONFIG_MII=y
>>   CONFIG_PINCTRL=y
>>   CONFIG_PINCTRL_IMX7=y
>> diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
>> index 1d0df9dd44..4dc206566e 100644
>> --- a/include/configs/pico-imx7d.h
>> +++ b/include/configs/pico-imx7d.h
>> @@ -29,17 +29,6 @@
>>   
>>   #define CONFIG_MXC_UART_BASE		UART5_IPS_BASE_ADDR
>>   
>> -/* Network */
>> -#define CONFIG_FEC_MXC
>> -#define CONFIG_FEC_XCV_TYPE		RGMII
>> -#define CONFIG_ETHPRIME			"FEC"
>> -#define CONFIG_FEC_MXC_PHYADDR		1
>> -
>> -#define CONFIG_PHY_ATHEROS
>> -
>> -/* ENET1 */
>> -#define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
>> -
>>   /* MMC Config */
>>   #define CONFIG_SYS_FSL_ESDHC_ADDR	0
>>   
>>
Stefano Babic Jan. 5, 2020, 10:31 a.m. UTC | #5
Hi Joris,

On 04/01/20 13:03, Joris Offouga wrote:
> Hi Stefano,
> 
> Sorry for the delay,
> 
> Le 28/12/2019 à 12:31, Stefano Babic a écrit :
>> Hi Joris,
>>
>>
>>
>> On 08/12/19 18:02, Joris Offouga wrote:
>>> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
>>> ---
>>>   board/technexion/pico-imx7d/pico-imx7d.c | 46 ------------------------
>>>   configs/pico-dwarf-imx7d_defconfig       |  5 +++
>>>   configs/pico-hobbit-imx7d_defconfig      |  5 +++
>>>   configs/pico-imx7d_bl33_defconfig        |  5 +++
>>>   configs/pico-imx7d_defconfig             |  5 +++
>>>   configs/pico-nymph-imx7d_defconfig       |  5 +++
>>>   configs/pico-pi-imx7d_defconfig          |  5 +++
>>>   include/configs/pico-imx7d.h             | 11 ------
>>>   8 files changed, 30 insertions(+), 57 deletions(-)
>>>
>> I get build errors with pico-imx7d_bl33.
>>
>>     https://travis-ci.org/sbabic/u-boot-imx/jobs/630056283
>>
>>
>>   Could you take a look, please ?
> 
> I tried to correct the compilation error but I did not find good ways to
> do it, I suggest you remove the usb ethernet support from the
> configuration :
> 
> -CONFIG_USB_ETHER=y
> -CONFIG_USB_ETH_CDC=y
> -CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> 
> If you agree I send V2

If the board maintainer (Otavio) agrees it, I am fine.

Best regards,
Stefano

> 
> Best regards,
> 
> Joris
> 
>>
>> Best regards,
>> Stefano
>>
>>> diff --git a/board/technexion/pico-imx7d/pico-imx7d.c
>>> b/board/technexion/pico-imx7d/pico-imx7d.c
>>> index bcfc7d361e..b7ca2e1315 100644
>>> --- a/board/technexion/pico-imx7d/pico-imx7d.c
>>> +++ b/board/technexion/pico-imx7d/pico-imx7d.c
>>> @@ -16,7 +16,6 @@
>>>   #include <common.h>
>>>   #include <i2c.h>
>>>   #include <miiphy.h>
>>> -#include <netdev.h>
>>>   #include <power/pmic.h>
>>>   #include <power/pfuze3000_pmic.h>
>>>   #include "../../freescale/common/pfuze.h"
>>> @@ -26,11 +25,6 @@ DECLARE_GLOBAL_DATA_PTR;
>>>   #define UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM | \
>>>       PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
>>>   -#define ENET_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM |
>>> PAD_CTL_DSE_3P3V_49OHM)
>>> -#define ENET_PAD_CTRL_MII  (PAD_CTL_DSE_3P3V_32OHM)
>>> -
>>> -#define ENET_RX_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM |
>>> PAD_CTL_DSE_3P3V_49OHM)
>>> -
>>>   #define I2C_PAD_CTRL    (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
>>>       PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
>>>   @@ -123,44 +117,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
>>>   };
>>>     #ifdef CONFIG_FEC_MXC
>>> -static iomux_v3_cfg_t const fec1_pads[] = {
>>> -    MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
>>> -    MX7D_PAD_SD2_WP__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
>>> -    MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC |
>>> MUX_PAD_CTRL(ENET_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 |
>>> MUX_PAD_CTRL(ENET_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 |
>>> MUX_PAD_CTRL(ENET_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 |
>>> MUX_PAD_CTRL(ENET_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 |
>>> MUX_PAD_CTRL(ENET_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL |
>>> MUX_PAD_CTRL(ENET_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC |
>>> MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 |
>>> MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 |
>>> MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 |
>>> MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 |
>>> MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>>> -    MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL |
>>> MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
>>> -    MX7D_PAD_SD3_STROBE__GPIO6_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
>>> -    MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
>>> -};
>>> -
>>> -#define FEC1_RST_GPIO    IMX_GPIO_NR(6, 11)
>>> -
>>> -static void setup_iomux_fec(void)
>>> -{
>>> -    imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
>>> -    gpio_request(FEC1_RST_GPIO, "phy_rst");
>>> -    gpio_direction_output(FEC1_RST_GPIO, 0);
>>> -    udelay(500);
>>> -    gpio_set_value(FEC1_RST_GPIO, 1);
>>> -}
>>> -
>>> -int board_eth_init(bd_t *bis)
>>> -{
>>> -    setup_iomux_fec();
>>> -
>>> -    return fecmxc_initialize_multi(bis, 0,
>>> -        CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
>>> -}
>>> -
>>>   static int setup_fec(void)
>>>   {
>>>       struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs
>>> @@ -235,9 +191,7 @@ int board_init(void)
>>>       gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
>>>     #ifdef CONFIG_DM_VIDEO
>>> -
>>>       setup_lcd();
>>> -
>>>   #endif
>>>   #ifdef CONFIG_FEC_MXC
>>>       setup_fec();
>>> diff --git a/configs/pico-dwarf-imx7d_defconfig
>>> b/configs/pico-dwarf-imx7d_defconfig
>>> index 94d73ee051..2437a64dd0 100644
>>> --- a/configs/pico-dwarf-imx7d_defconfig
>>> +++ b/configs/pico-dwarf-imx7d_defconfig
>>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>>   CONFIG_FSL_USDHC=y
>>>   CONFIG_MTD=y
>>>   CONFIG_PHYLIB=y
>>> +CONFIG_PHY_ATHEROS=y
>>> +CONFIG_DM_ETH=y
>>> +CONFIG_DM_MDIO=y
>>> +CONFIG_FEC_MXC=y
>>> +CONFIG_RGMII=y
>>>   CONFIG_MII=y
>>>   CONFIG_PINCTRL=y
>>>   CONFIG_PINCTRL_IMX7=y
>>> diff --git a/configs/pico-hobbit-imx7d_defconfig
>>> b/configs/pico-hobbit-imx7d_defconfig
>>> index ef86b0cd66..3467d4c2e4 100644
>>> --- a/configs/pico-hobbit-imx7d_defconfig
>>> +++ b/configs/pico-hobbit-imx7d_defconfig
>>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>>   CONFIG_FSL_USDHC=y
>>>   CONFIG_MTD=y
>>>   CONFIG_PHYLIB=y
>>> +CONFIG_PHY_ATHEROS=y
>>> +CONFIG_DM_ETH=y
>>> +CONFIG_DM_MDIO=y
>>> +CONFIG_FEC_MXC=y
>>> +CONFIG_RGMII=y
>>>   CONFIG_MII=y
>>>   CONFIG_PINCTRL=y
>>>   CONFIG_PINCTRL_IMX7=y
>>> diff --git a/configs/pico-imx7d_bl33_defconfig
>>> b/configs/pico-imx7d_bl33_defconfig
>>> index 51d3514072..49a4e1b0c1 100644
>>> --- a/configs/pico-imx7d_bl33_defconfig
>>> +++ b/configs/pico-imx7d_bl33_defconfig
>>> @@ -50,6 +50,11 @@ CONFIG_DM_MMC=y
>>>   CONFIG_FSL_USDHC=y
>>>   CONFIG_MTD=y
>>>   CONFIG_PHYLIB=y
>>> +CONFIG_PHY_ATHEROS=y
>>> +CONFIG_DM_ETH=y
>>> +CONFIG_DM_MDIO=y
>>> +CONFIG_FEC_MXC=y
>>> +CONFIG_RGMII=y
>>>   CONFIG_MII=y
>>>   CONFIG_PINCTRL=y
>>>   CONFIG_PINCTRL_IMX7=y
>>> diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
>>> index bf4d56ec2c..a1975b9d56 100644
>>> --- a/configs/pico-imx7d_defconfig
>>> +++ b/configs/pico-imx7d_defconfig
>>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>>   CONFIG_FSL_USDHC=y
>>>   CONFIG_MTD=y
>>>   CONFIG_PHYLIB=y
>>> +CONFIG_PHY_ATHEROS=y
>>> +CONFIG_DM_ETH=y
>>> +CONFIG_DM_MDIO=y
>>> +CONFIG_FEC_MXC=y
>>> +CONFIG_RGMII=y
>>>   CONFIG_MII=y
>>>   CONFIG_PINCTRL=y
>>>   CONFIG_PINCTRL_IMX7=y
>>> diff --git a/configs/pico-nymph-imx7d_defconfig
>>> b/configs/pico-nymph-imx7d_defconfig
>>> index 94d73ee051..2437a64dd0 100644
>>> --- a/configs/pico-nymph-imx7d_defconfig
>>> +++ b/configs/pico-nymph-imx7d_defconfig
>>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>>   CONFIG_FSL_USDHC=y
>>>   CONFIG_MTD=y
>>>   CONFIG_PHYLIB=y
>>> +CONFIG_PHY_ATHEROS=y
>>> +CONFIG_DM_ETH=y
>>> +CONFIG_DM_MDIO=y
>>> +CONFIG_FEC_MXC=y
>>> +CONFIG_RGMII=y
>>>   CONFIG_MII=y
>>>   CONFIG_PINCTRL=y
>>>   CONFIG_PINCTRL_IMX7=y
>>> diff --git a/configs/pico-pi-imx7d_defconfig
>>> b/configs/pico-pi-imx7d_defconfig
>>> index c6f5b872c3..f1e439602b 100644
>>> --- a/configs/pico-pi-imx7d_defconfig
>>> +++ b/configs/pico-pi-imx7d_defconfig
>>> @@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y
>>>   CONFIG_FSL_USDHC=y
>>>   CONFIG_MTD=y
>>>   CONFIG_PHYLIB=y
>>> +CONFIG_PHY_ATHEROS=y
>>> +CONFIG_DM_ETH=y
>>> +CONFIG_DM_MDIO=y
>>> +CONFIG_FEC_MXC=y
>>> +CONFIG_RGMII=y
>>>   CONFIG_MII=y
>>>   CONFIG_PINCTRL=y
>>>   CONFIG_PINCTRL_IMX7=y
>>> diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
>>> index 1d0df9dd44..4dc206566e 100644
>>> --- a/include/configs/pico-imx7d.h
>>> +++ b/include/configs/pico-imx7d.h
>>> @@ -29,17 +29,6 @@
>>>     #define CONFIG_MXC_UART_BASE        UART5_IPS_BASE_ADDR
>>>   -/* Network */
>>> -#define CONFIG_FEC_MXC
>>> -#define CONFIG_FEC_XCV_TYPE        RGMII
>>> -#define CONFIG_ETHPRIME            "FEC"
>>> -#define CONFIG_FEC_MXC_PHYADDR        1
>>> -
>>> -#define CONFIG_PHY_ATHEROS
>>> -
>>> -/* ENET1 */
>>> -#define IMX_FEC_BASE            ENET_IPS_BASE_ADDR
>>> -
>>>   /* MMC Config */
>>>   #define CONFIG_SYS_FSL_ESDHC_ADDR    0
>>>
Otavio Salvador Jan. 5, 2020, 5:36 p.m. UTC | #6
On Sun, Jan 5, 2020 at 7:32 AM Stefano Babic <sbabic@denx.de> wrote:
>
> On 04/01/20 13:03, Joris Offouga wrote:
> > Hi Stefano,
> >
> > Sorry for the delay,
> >
> > Le 28/12/2019 à 12:31, Stefano Babic a écrit :
> >> Hi Joris,
> >>
> >>
> >>
> >> On 08/12/19 18:02, Joris Offouga wrote:
> >>> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> >>> ---
> >>>   board/technexion/pico-imx7d/pico-imx7d.c | 46 ------------------------
> >>>   configs/pico-dwarf-imx7d_defconfig       |  5 +++
> >>>   configs/pico-hobbit-imx7d_defconfig      |  5 +++
> >>>   configs/pico-imx7d_bl33_defconfig        |  5 +++
> >>>   configs/pico-imx7d_defconfig             |  5 +++
> >>>   configs/pico-nymph-imx7d_defconfig       |  5 +++
> >>>   configs/pico-pi-imx7d_defconfig          |  5 +++
> >>>   include/configs/pico-imx7d.h             | 11 ------
> >>>   8 files changed, 30 insertions(+), 57 deletions(-)
> >>>
> >> I get build errors with pico-imx7d_bl33.
> >>
> >>     https://travis-ci.org/sbabic/u-boot-imx/jobs/630056283
> >>
> >>
> >>   Could you take a look, please ?
> >
> > I tried to correct the compilation error but I did not find good ways to
> > do it, I suggest you remove the usb ethernet support from the
> > configuration :
> >
> > -CONFIG_USB_ETHER=y
> > -CONFIG_USB_ETH_CDC=y
> > -CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
> >
> > If you agree I send V2
>
> If the board maintainer (Otavio) agrees it, I am fine.

I agree. However, do this as a commit prior to this one so if someone
ever wants to revert it is easy. Also, explain the reasoning on the
commit log.

Patch
diff mbox series

diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index bcfc7d361e..b7ca2e1315 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -16,7 +16,6 @@ 
 #include <common.h>
 #include <i2c.h>
 #include <miiphy.h>
-#include <netdev.h>
 #include <power/pmic.h>
 #include <power/pfuze3000_pmic.h>
 #include "../../freescale/common/pfuze.h"
@@ -26,11 +25,6 @@  DECLARE_GLOBAL_DATA_PTR;
 #define UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM | \
 	PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
 
-#define ENET_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
-#define ENET_PAD_CTRL_MII  (PAD_CTL_DSE_3P3V_32OHM)
-
-#define ENET_RX_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
-
 #define I2C_PAD_CTRL    (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
 	PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU100KOHM)
 
@@ -123,44 +117,6 @@  static iomux_v3_cfg_t const uart5_pads[] = {
 };
 
 #ifdef CONFIG_FEC_MXC
-static iomux_v3_cfg_t const fec1_pads[] = {
-	MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
-	MX7D_PAD_SD2_WP__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
-	MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
-	MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL | MUX_PAD_CTRL(ENET_RX_PAD_CTRL),
-	MX7D_PAD_SD3_STROBE__GPIO6_IO10 | MUX_PAD_CTRL(NO_PAD_CTRL),
-	MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(NO_PAD_CTRL),
-};
-
-#define FEC1_RST_GPIO	IMX_GPIO_NR(6, 11)
-
-static void setup_iomux_fec(void)
-{
-	imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
-	gpio_request(FEC1_RST_GPIO, "phy_rst");
-	gpio_direction_output(FEC1_RST_GPIO, 0);
-	udelay(500);
-	gpio_set_value(FEC1_RST_GPIO, 1);
-}
-
-int board_eth_init(bd_t *bis)
-{
-	setup_iomux_fec();
-
-	return fecmxc_initialize_multi(bis, 0,
-		CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
-}
-
 static int setup_fec(void)
 {
 	struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs
@@ -235,9 +191,7 @@  int board_init(void)
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
 #ifdef CONFIG_DM_VIDEO
-
 	setup_lcd();
-
 #endif
 #ifdef CONFIG_FEC_MXC
 	setup_fec();
diff --git a/configs/pico-dwarf-imx7d_defconfig b/configs/pico-dwarf-imx7d_defconfig
index 94d73ee051..2437a64dd0 100644
--- a/configs/pico-dwarf-imx7d_defconfig
+++ b/configs/pico-dwarf-imx7d_defconfig
@@ -59,6 +59,11 @@  CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
index ef86b0cd66..3467d4c2e4 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -59,6 +59,11 @@  CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-imx7d_bl33_defconfig b/configs/pico-imx7d_bl33_defconfig
index 51d3514072..49a4e1b0c1 100644
--- a/configs/pico-imx7d_bl33_defconfig
+++ b/configs/pico-imx7d_bl33_defconfig
@@ -50,6 +50,11 @@  CONFIG_DM_MMC=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index bf4d56ec2c..a1975b9d56 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -59,6 +59,11 @@  CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-nymph-imx7d_defconfig b/configs/pico-nymph-imx7d_defconfig
index 94d73ee051..2437a64dd0 100644
--- a/configs/pico-nymph-imx7d_defconfig
+++ b/configs/pico-nymph-imx7d_defconfig
@@ -59,6 +59,11 @@  CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index c6f5b872c3..f1e439602b 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -59,6 +59,11 @@  CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_ATHEROS=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 1d0df9dd44..4dc206566e 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -29,17 +29,6 @@ 
 
 #define CONFIG_MXC_UART_BASE		UART5_IPS_BASE_ADDR
 
-/* Network */
-#define CONFIG_FEC_MXC
-#define CONFIG_FEC_XCV_TYPE		RGMII
-#define CONFIG_ETHPRIME			"FEC"
-#define CONFIG_FEC_MXC_PHYADDR		1
-
-#define CONFIG_PHY_ATHEROS
-
-/* ENET1 */
-#define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
-
 /* MMC Config */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0