* [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig
@ 2020-02-03 16:09 Fabio Estevam
2020-02-03 16:09 ` [PATCH 2/2] mx6ul_evk: Remove FEC related board code Fabio Estevam
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Fabio Estevam @ 2020-02-03 16:09 UTC (permalink / raw)
To: u-boot
CONFIG_FEC_MXC is supported in Kconfig, so it is preferred to
move it to defconfig file.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
configs/mx6ul_14x14_evk_defconfig | 1 +
include/configs/mx6ul_14x14_evk.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig
index 4fd311d2fb..f72f050561 100644
--- a/configs/mx6ul_14x14_evk_defconfig
+++ b/configs/mx6ul_14x14_evk_defconfig
@@ -55,6 +55,7 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y
CONFIG_PHY_MICREL_KSZ8XXX=y
+CONFIG_FEC_MXC=y
CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_PINCTRL=y
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 5cc15b6d2f..a35077ddb8 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -177,7 +177,6 @@
#endif
#ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC
#define CONFIG_FEC_ENET_DEV 1
#if (CONFIG_FEC_ENET_DEV == 0)
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] mx6ul_evk: Remove FEC related board code
2020-02-03 16:09 [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig Fabio Estevam
@ 2020-02-03 16:09 ` Fabio Estevam
2020-02-05 7:21 ` Peng Fan
2020-04-18 10:50 ` sbabic at denx.de
2020-02-05 7:21 ` [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig Peng Fan
2020-04-18 10:51 ` sbabic at denx.de
2 siblings, 2 replies; 6+ messages in thread
From: Fabio Estevam @ 2020-02-03 16:09 UTC (permalink / raw)
To: u-boot
mx6ul_evk uses DM_ETH, so there is no need to have board code
to setup the FEC IOMUX and to register the network ports via the
old board_eth_init() method.
Remove these FEC related pieces of code.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
.../mx6ul_14x14_evk/mx6ul_14x14_evk.c | 50 -------------------
1 file changed, 50 deletions(-)
diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
index 086e0e6739..6b87f5c1b0 100644
--- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
+++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
@@ -196,56 +196,6 @@ int board_ehci_hcd_init(int port)
#endif
#ifdef CONFIG_FEC_MXC
-/*
- * pin conflicts for fec1 and fec2, GPIO1_IO06 and GPIO1_IO07 can only
- * be used for ENET1 or ENET2, cannot be used for both.
- */
-static iomux_v3_cfg_t const fec1_pads[] = {
- MX6_PAD_GPIO1_IO06__ENET1_MDIO | MUX_PAD_CTRL(MDIO_PAD_CTRL),
- MX6_PAD_GPIO1_IO07__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET1_TX_EN__ENET1_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),
- MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET1_RX_ER__ENET1_RX_ER | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET1_RX_EN__ENET1_RX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
-};
-
-static iomux_v3_cfg_t const fec2_pads[] = {
- MX6_PAD_GPIO1_IO06__ENET2_MDIO | MUX_PAD_CTRL(MDIO_PAD_CTRL),
- MX6_PAD_GPIO1_IO07__ENET2_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
-
- MX6_PAD_ENET2_TX_DATA0__ENET2_TDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET2_TX_DATA1__ENET2_TDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 | MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),
- MX6_PAD_ENET2_TX_EN__ENET2_TX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
-
- MX6_PAD_ENET2_RX_DATA0__ENET2_RDATA00 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET2_RX_DATA1__ENET2_RDATA01 | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET2_RX_EN__ENET2_RX_EN | MUX_PAD_CTRL(ENET_PAD_CTRL),
- MX6_PAD_ENET2_RX_ER__ENET2_RX_ER | MUX_PAD_CTRL(ENET_PAD_CTRL),
-};
-
-static void setup_iomux_fec(int fec_id)
-{
- if (fec_id == 0)
- imx_iomux_v3_setup_multiple_pads(fec1_pads,
- ARRAY_SIZE(fec1_pads));
- else
- imx_iomux_v3_setup_multiple_pads(fec2_pads,
- ARRAY_SIZE(fec2_pads));
-}
-
-int board_eth_init(bd_t *bis)
-{
- setup_iomux_fec(CONFIG_FEC_ENET_DEV);
-
- return fecmxc_initialize_multi(bis, CONFIG_FEC_ENET_DEV,
- CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
-}
-
static int setup_fec(int fec_id)
{
struct iomuxc *const iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig
2020-02-03 16:09 [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig Fabio Estevam
2020-02-03 16:09 ` [PATCH 2/2] mx6ul_evk: Remove FEC related board code Fabio Estevam
@ 2020-02-05 7:21 ` Peng Fan
2020-04-18 10:51 ` sbabic at denx.de
2 siblings, 0 replies; 6+ messages in thread
From: Peng Fan @ 2020-02-05 7:21 UTC (permalink / raw)
To: u-boot
> Subject: [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig
>
> CONFIG_FEC_MXC is supported in Kconfig, so it is preferred to move it to
> defconfig file.
>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
> ---
> configs/mx6ul_14x14_evk_defconfig | 1 +
> include/configs/mx6ul_14x14_evk.h | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configs/mx6ul_14x14_evk_defconfig
> b/configs/mx6ul_14x14_evk_defconfig
> index 4fd311d2fb..f72f050561 100644
> --- a/configs/mx6ul_14x14_evk_defconfig
> +++ b/configs/mx6ul_14x14_evk_defconfig
> @@ -55,6 +55,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_PHYLIB=y
> CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y
> +CONFIG_FEC_MXC=y
> CONFIG_DM_ETH=y
> CONFIG_MII=y
> CONFIG_PINCTRL=y
> diff --git a/include/configs/mx6ul_14x14_evk.h
> b/include/configs/mx6ul_14x14_evk.h
> index 5cc15b6d2f..a35077ddb8 100644
> --- a/include/configs/mx6ul_14x14_evk.h
> +++ b/include/configs/mx6ul_14x14_evk.h
> @@ -177,7 +177,6 @@
> #endif
>
> #ifdef CONFIG_CMD_NET
> -#define CONFIG_FEC_MXC
> #define CONFIG_FEC_ENET_DEV 1
>
> #if (CONFIG_FEC_ENET_DEV == 0)
> --
> 2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] mx6ul_evk: Remove FEC related board code
2020-02-03 16:09 ` [PATCH 2/2] mx6ul_evk: Remove FEC related board code Fabio Estevam
@ 2020-02-05 7:21 ` Peng Fan
2020-04-18 10:50 ` sbabic at denx.de
1 sibling, 0 replies; 6+ messages in thread
From: Peng Fan @ 2020-02-05 7:21 UTC (permalink / raw)
To: u-boot
> Subject: [PATCH 2/2] mx6ul_evk: Remove FEC related board code
>
> mx6ul_evk uses DM_ETH, so there is no need to have board code to setup the
> FEC IOMUX and to register the network ports via the old board_eth_init()
> method.
>
> Remove these FEC related pieces of code.
>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
> ---
> .../mx6ul_14x14_evk/mx6ul_14x14_evk.c | 50 -------------------
> 1 file changed, 50 deletions(-)
>
> diff --git a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> index 086e0e6739..6b87f5c1b0 100644
> --- a/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> +++ b/board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
> @@ -196,56 +196,6 @@ int board_ehci_hcd_init(int port) #endif
>
> #ifdef CONFIG_FEC_MXC
> -/*
> - * pin conflicts for fec1 and fec2, GPIO1_IO06 and GPIO1_IO07 can only
> - * be used for ENET1 or ENET2, cannot be used for both.
> - */
> -static iomux_v3_cfg_t const fec1_pads[] = {
> - MX6_PAD_GPIO1_IO06__ENET1_MDIO |
> MUX_PAD_CTRL(MDIO_PAD_CTRL),
> - MX6_PAD_GPIO1_IO07__ENET1_MDC |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET1_TX_DATA0__ENET1_TDATA00 |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET1_TX_DATA1__ENET1_TDATA01 |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET1_TX_EN__ENET1_TX_EN |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 |
> MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),
> - MX6_PAD_ENET1_RX_DATA0__ENET1_RDATA00 |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET1_RX_DATA1__ENET1_RDATA01 |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET1_RX_ER__ENET1_RX_ER |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET1_RX_EN__ENET1_RX_EN |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> -};
> -
> -static iomux_v3_cfg_t const fec2_pads[] = {
> - MX6_PAD_GPIO1_IO06__ENET2_MDIO |
> MUX_PAD_CTRL(MDIO_PAD_CTRL),
> - MX6_PAD_GPIO1_IO07__ENET2_MDC |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> -
> - MX6_PAD_ENET2_TX_DATA0__ENET2_TDATA00 |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET2_TX_DATA1__ENET2_TDATA01 |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 |
> MUX_PAD_CTRL(ENET_CLK_PAD_CTRL),
> - MX6_PAD_ENET2_TX_EN__ENET2_TX_EN |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> -
> - MX6_PAD_ENET2_RX_DATA0__ENET2_RDATA00 |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET2_RX_DATA1__ENET2_RDATA01 |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET2_RX_EN__ENET2_RX_EN |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> - MX6_PAD_ENET2_RX_ER__ENET2_RX_ER |
> MUX_PAD_CTRL(ENET_PAD_CTRL),
> -};
> -
> -static void setup_iomux_fec(int fec_id) -{
> - if (fec_id == 0)
> - imx_iomux_v3_setup_multiple_pads(fec1_pads,
> - ARRAY_SIZE(fec1_pads));
> - else
> - imx_iomux_v3_setup_multiple_pads(fec2_pads,
> - ARRAY_SIZE(fec2_pads));
> -}
> -
> -int board_eth_init(bd_t *bis)
> -{
> - setup_iomux_fec(CONFIG_FEC_ENET_DEV);
> -
> - return fecmxc_initialize_multi(bis, CONFIG_FEC_ENET_DEV,
> - CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
> -}
> -
> static int setup_fec(int fec_id)
> {
> struct iomuxc *const iomuxc_regs = (struct iomuxc
> *)IOMUXC_BASE_ADDR;
> --
> 2.17.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] mx6ul_evk: Remove FEC related board code
2020-02-03 16:09 ` [PATCH 2/2] mx6ul_evk: Remove FEC related board code Fabio Estevam
2020-02-05 7:21 ` Peng Fan
@ 2020-04-18 10:50 ` sbabic at denx.de
1 sibling, 0 replies; 6+ messages in thread
From: sbabic at denx.de @ 2020-04-18 10:50 UTC (permalink / raw)
To: u-boot
> mx6ul_evk uses DM_ETH, so there is no need to have board code
> to setup the FEC IOMUX and to register the network ports via the
> old board_eth_init() method.
> Remove these FEC related pieces of code.
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> Reviewed-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig
2020-02-03 16:09 [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig Fabio Estevam
2020-02-03 16:09 ` [PATCH 2/2] mx6ul_evk: Remove FEC related board code Fabio Estevam
2020-02-05 7:21 ` [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig Peng Fan
@ 2020-04-18 10:51 ` sbabic at denx.de
2 siblings, 0 replies; 6+ messages in thread
From: sbabic at denx.de @ 2020-04-18 10:51 UTC (permalink / raw)
To: u-boot
> CONFIG_FEC_MXC is supported in Kconfig, so it is preferred to
> move it to defconfig file.
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> Reviewed-by: Peng Fan <peng.fan@nxp.com>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-04-18 10:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-03 16:09 [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig Fabio Estevam
2020-02-03 16:09 ` [PATCH 2/2] mx6ul_evk: Remove FEC related board code Fabio Estevam
2020-02-05 7:21 ` Peng Fan
2020-04-18 10:50 ` sbabic at denx.de
2020-02-05 7:21 ` [PATCH 1/2] mx6ul_evk: Move CONFIG_FEC_MXC to defconfig Peng Fan
2020-04-18 10:51 ` sbabic at denx.de
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.