[U-Boot] [PATCH v1 6/6] colibri_imx7: migrate to DM_ETH
Oleksandr Suvorov
cryosay at gmail.com
Tue Dec 3 15:44:15 CET 2019
On Mon, Nov 4, 2019 at 12:16 PM Igor Opaniuk <igor.opaniuk at gmail.com> wrote:
>
> From: Igor Opaniuk <igor.opaniuk at toradex.com>
>
> Migrate to DM_ETH and remove hardcoded pinmux configuration.
>
> Signed-off-by: Igor Opaniuk <igor.opaniuk at toradex.com>
Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov at toradex.com>
> ---
>
> board/toradex/colibri_imx7/colibri_imx7.c | 44 -----------------------
> configs/colibri_imx7_defconfig | 5 ++-
> configs/colibri_imx7_emmc_defconfig | 5 ++-
> include/configs/colibri_imx7.h | 11 ------
> 4 files changed, 8 insertions(+), 57 deletions(-)
>
> diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
> index c001316591..3ef381da1a 100644
> --- a/board/toradex/colibri_imx7/colibri_imx7.c
> +++ b/board/toradex/colibri_imx7/colibri_imx7.c
> @@ -159,50 +159,12 @@ void board_preboot_os(void)
> gpio_direction_output(GPIO_BL_ON, 0);
> }
>
> -#ifdef CONFIG_FEC_MXC
> -static iomux_v3_cfg_t const fec1_pads[] = {
> -#ifndef CONFIG_COLIBRI_IMX7_EXT_PHYCLK
> - MX7D_PAD_GPIO1_IO12__CCM_ENET_REF_CLK1 | MUX_PAD_CTRL(ENET_PAD_CTRL) | MUX_MODE_SION,
> -#else
> - MX7D_PAD_GPIO1_IO12__CCM_ENET_REF_CLK1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
> -#endif
> - 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_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_RXC__ENET1_RX_ER | 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_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_TX_CTL__ENET1_RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL),
> -};
> -
> -static void setup_iomux_fec(void)
> -{
> - imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
> -}
> -#endif
> -
> static void setup_iomux_uart(void)
> {
> imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads));
> }
>
> #ifdef CONFIG_FEC_MXC
> -int board_eth_init(bd_t *bis)
> -{
> - int ret;
> -
> - setup_iomux_fec();
> -
> - ret = fecmxc_initialize_multi(bis, 0,
> - CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
> - if (ret)
> - printf("FEC1 MXC: %s:failed\n", __func__);
> -
> - return ret;
> -}
> -
> static int setup_fec(void)
> {
> struct iomuxc_gpr_base_regs *const iomuxc_gpr_regs
> @@ -226,12 +188,6 @@ static int setup_fec(void)
> return set_clk_enet(ENET_50MHZ);
> }
>
> -int board_phy_config(struct phy_device *phydev)
> -{
> - if (phydev->drv->config)
> - phydev->drv->config(phydev);
> - return 0;
> -}
> #endif
>
> int board_early_init_f(void)
> diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
> index a6457d5054..504af04b7b 100644
> --- a/configs/colibri_imx7_defconfig
> +++ b/configs/colibri_imx7_defconfig
> @@ -2,11 +2,11 @@ CONFIG_ARM=y
> CONFIG_SYS_THUMB_BUILD=y
> CONFIG_ARCH_MX7=y
> CONFIG_SYS_TEXT_BASE=0x87800000
> -CONFIG_IMX_HAB=y
> CONFIG_TARGET_COLIBRI_IMX7=y
> CONFIG_NR_DRAM_BANKS=1
> CONFIG_IMX_RDC=y
> CONFIG_IMX_BOOTAUX=y
> +CONFIG_IMX_HAB=y
> # CONFIG_CMD_DEKBLOB is not set
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
> @@ -62,6 +62,9 @@ CONFIG_MTD_UBI_FASTMAP=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
> index b4ca115f13..eee39c70d9 100644
> --- a/configs/colibri_imx7_emmc_defconfig
> +++ b/configs/colibri_imx7_emmc_defconfig
> @@ -2,12 +2,12 @@ CONFIG_ARM=y
> CONFIG_SYS_THUMB_BUILD=y
> CONFIG_ARCH_MX7=y
> CONFIG_SYS_TEXT_BASE=0x87800000
> -CONFIG_IMX_HAB=y
> CONFIG_TARGET_COLIBRI_IMX7=y
> CONFIG_TARGET_COLIBRI_IMX7_EMMC=y
> CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
> CONFIG_IMX_RDC=y
> CONFIG_IMX_BOOTAUX=y
> +CONFIG_IMX_HAB=y
> # CONFIG_CMD_DEKBLOB is not set
> CONFIG_DISTRO_DEFAULTS=y
> CONFIG_FIT=y
> @@ -58,6 +58,9 @@ CONFIG_FSL_USDHC=y
> CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y
> CONFIG_PHY_MICREL_KSZ8XXX=y
> +CONFIG_DM_ETH=y
> +CONFIG_DM_MDIO=y
> +CONFIG_FEC_MXC=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> CONFIG_PINCTRL_IMX7=y
> diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
> index c2d98291b0..9cb07c08f3 100644
> --- a/include/configs/colibri_imx7.h
> +++ b/include/configs/colibri_imx7.h
> @@ -16,17 +16,6 @@
> /* Size of malloc() pool */
> #define CONFIG_SYS_MALLOC_LEN (32 * SZ_1M)
>
> -/* Network */
> -#define CONFIG_FEC_MXC
> -#define CONFIG_FEC_XCV_TYPE RMII
> -#define CONFIG_ETHPRIME "FEC"
> -#define CONFIG_FEC_MXC_PHYADDR 0
> -
> -#define CONFIG_TFTP_TSIZE
> -
> -/* ENET1 */
> -#define IMX_FEC_BASE ENET_IPS_BASE_ADDR
> -
> /* MMC Config*/
> #define CONFIG_SYS_FSL_ESDHC_ADDR 0
> #ifdef CONFIG_TARGET_COLIBRI_IMX7_NAND
> --
> 2.17.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
--
Best regards
Oleksandr Suvorov
cryosay at gmail.com
More information about the U-Boot
mailing list