[PATCH 3/4] mx6sabresd: Convert ethernet to driver model

Stefano Babic sbabic at denx.de
Mon Feb 10 10:10:23 CET 2020


On 20.01.20 17:31, Alifer Moraes wrote:
> Convert imx6sabresd ethernet to driver model to fix the following warning:
> 
> ===================== WARNING ======================
> This board does not use CONFIG_DM_ETH (Driver Model
> for Ethernet drivers). Please update the board to use
> CONFIG_DM_ETH before the v2020.07 release. Failure to
> update by the deadline may result in board removal.
> See doc/driver-model/migration.rst for more info.
> ====================================================
> 
> Signed-off-by: Alifer Moraes <alifer.wsdm at gmail.com>

Patch is fine, but I get some warning after merging. Can you fix them
and repost, please ? Thanks !

+  setup_iomux_enet();
+  ^~~~~~~~~~~~~~~~
+  return cpu_eth_init(bis);
+         ^~~~~~~~~~~~

w+board/freescale/mx6sabresd/mx6sabresd.c:471:2: warning: implicit
declaration of function ‘setup_iomux_enet’ [-Wimplicit-function-declaration]
w+board/freescale/mx6sabresd/mx6sabresd.c:473:9: warning: implicit
declaration of function ‘cpu_eth_init’ [-Wimplicit-function-declaration]

Best regards,
Stefano

> ---
>  board/freescale/mx6sabresd/mx6sabresd.c | 29 -------------------------
>  configs/mx6sabresd_defconfig            |  5 +++++
>  include/configs/mx6sabresd.h            |  9 --------
>  3 files changed, 5 insertions(+), 38 deletions(-)
> 
> diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
> index 4a208277ac..4b0af86f0b 100644
> --- a/board/freescale/mx6sabresd/mx6sabresd.c
> +++ b/board/freescale/mx6sabresd/mx6sabresd.c
> @@ -21,7 +21,6 @@
>  #include <mmc.h>
>  #include <fsl_esdhc_imx.h>
>  #include <miiphy.h>
> -#include <netdev.h>
>  #include <asm/arch/mxc_hdmi.h>
>  #include <asm/arch/crm_regs.h>
>  #include <asm/io.h>
> @@ -44,9 +43,6 @@ DECLARE_GLOBAL_DATA_PTR;
>  	PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm |			\
>  	PAD_CTL_SRE_FAST  | PAD_CTL_HYS)
>  
> -#define ENET_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
> -	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
> -
>  #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
>  		      PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
>  
> @@ -73,31 +69,6 @@ static iomux_v3_cfg_t const uart1_pads[] = {
>  	IOMUX_PADS(PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
>  };
>  
> -static iomux_v3_cfg_t const enet_pads[] = {
> -	IOMUX_PADS(PAD_ENET_MDIO__ENET_MDIO	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_ENET_MDC__ENET_MDC	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TXC__RGMII_TXC	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TD0__RGMII_TD0	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TD1__RGMII_TD1	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TD2__RGMII_TD2	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TD3__RGMII_TD3	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_TX_CTL__RGMII_TX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_ENET_REF_CLK__ENET_TX_CLK	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL	| MUX_PAD_CTRL(ENET_PAD_CTRL)),
> -	/* AR8031 PHY Reset */
> -	IOMUX_PADS(PAD_ENET_CRS_DV__GPIO1_IO25	| MUX_PAD_CTRL(NO_PAD_CTRL)),
> -};
> -
> -static void setup_iomux_enet(void)
> -{
> -	SETUP_IOMUX_PADS(enet_pads);
> -}
> -
>  static iomux_v3_cfg_t const usdhc2_pads[] = {
>  	IOMUX_PADS(PAD_SD2_CLK__SD2_CLK	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
>  	IOMUX_PADS(PAD_SD2_CMD__SD2_CMD	| MUX_PAD_CTRL(USDHC_PAD_CTRL)),
> diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
> index e3b8908928..05428a142c 100644
> --- a/configs/mx6sabresd_defconfig
> +++ b/configs/mx6sabresd_defconfig
> @@ -81,6 +81,11 @@ CONFIG_SF_DEFAULT_MODE=0
>  CONFIG_SF_DEFAULT_SPEED=20000000
>  CONFIG_SPI_FLASH_STMICRO=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_PCI=y
>  CONFIG_DM_PCI=y
> diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
> index d810202117..ec1537541a 100644
> --- a/include/configs/mx6sabresd.h
> +++ b/include/configs/mx6sabresd.h
> @@ -62,13 +62,4 @@
>  #define CONFIG_USB_MAX_CONTROLLER_COUNT	1 /* Enabled USB controller number */
>  #endif
>  
> -#define CONFIG_FEC_MXC
> -#define IMX_FEC_BASE			ENET_BASE_ADDR
> -#define CONFIG_FEC_XCV_TYPE		RGMII
> -#define CONFIG_ETHPRIME			"FEC"
> -#define CONFIG_FEC_MXC_PHYADDR		1
> -
> -#define CONFIG_PHY_ATHEROS
> -
> -
>  #endif                         /* __MX6SABRESD_CONFIG_H */
> 


-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================


More information about the U-Boot mailing list