Skip to contentSkip to conversation

mx7dsabre: Remove warning about DM_SPI_FLASH

PATCH New Joris Offouga 4 participants 26 messages Dec 8, 2019 – Jan 29, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 mx7dsabre: Remove warning about DM_SPI_FLASH

This defconfig doesn't need it.

---
 configs/mx7dsabresd_defconfig | 3 ---
 1 file changed, 3 deletions(-)
configs/mx7dsabresd_defconfig +0 -3
index 2a9fdac338..3dac7136d2 100644
@@ -55,9 +55,6 @@ CONFIG_MMC_IO_VOLTAGE=y
 CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_FSL_USDHC=y
-CONFIG_MTD=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_EON=y
 CONFIG_PHYLIB=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 pico-imx7d: Convert to DM_ETH

---
 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(-)
board/technexion/pico-imx7d/pico-imx7d.c +0 -46
index bcfc7d361e..b7ca2e1315 100644
@@ -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();
configs/pico-dwarf-imx7d_defconfig +5 -0
index 94d73ee051..2437a64dd0 100644
@@ -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
configs/pico-hobbit-imx7d_defconfig +5 -0
index ef86b0cd66..3467d4c2e4 100644
@@ -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
configs/pico-imx7d_bl33_defconfig +5 -0
index 51d3514072..49a4e1b0c1 100644
@@ -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
configs/pico-imx7d_defconfig +5 -0
index bf4d56ec2c..a1975b9d56 100644
@@ -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
configs/pico-nymph-imx7d_defconfig +5 -0
index 94d73ee051..2437a64dd0 100644
@@ -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
configs/pico-pi-imx7d_defconfig +5 -0
index c6f5b872c3..f1e439602b 100644
@@ -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
include/configs/pico-imx7d.h +0 -11
index 1d0df9dd44..4dc206566e 100644
@@ -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
 
Signature · 1 line
2.20.1
#3 lore raw

PATCH 1/1 pico-imx7d: Convert to DM_ETH

In reply to Joris Offouga
Quoted 2 lines

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#4 lore raw

PATCH 1/1 pico-imx7d: Convert to DM_ETH

In reply to Joris Offouga

Hi Joris,

Quoted 12 lines · Joris Offouga
---
 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

Quoted 198 lines
board/technexion/pico-imx7d/pico-imx7d.c +0 -46
index bcfc7d361e..b7ca2e1315 100644
@@ -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();
configs/pico-dwarf-imx7d_defconfig +5 -0
index 94d73ee051..2437a64dd0 100644
@@ -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
configs/pico-hobbit-imx7d_defconfig +5 -0
index ef86b0cd66..3467d4c2e4 100644
@@ -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
configs/pico-imx7d_bl33_defconfig +5 -0
index 51d3514072..49a4e1b0c1 100644
@@ -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
configs/pico-imx7d_defconfig +5 -0
index bf4d56ec2c..a1975b9d56 100644
@@ -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
configs/pico-nymph-imx7d_defconfig +5 -0
index 94d73ee051..2437a64dd0 100644
@@ -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
configs/pico-pi-imx7d_defconfig +5 -0
index c6f5b872c3..f1e439602b 100644
@@ -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
include/configs/pico-imx7d.h +0 -11
index 1d0df9dd44..4dc206566e 100644
@@ -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
 
Signature · 5 lines
=====================================================================
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
=====================================================================
#5 lore raw

PATCH 1/1 pico-imx7d: Convert to DM_ETH

Hi Stefano,

Sorry for the delay,

Le 28/12/2019 à 12:31, Stefano Babic a écrit :

Quoted 17 lines

Hi Joris,

Quoted 12 lines · Joris Offouga
---
  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(-)
Quoted 6 lines

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

Quoted 202 lines

Best regards,
Stefano

Quoted 198 lines
board/technexion/pico-imx7d/pico-imx7d.c +0 -46
index bcfc7d361e..b7ca2e1315 100644
@@ -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();
configs/pico-dwarf-imx7d_defconfig +5 -0
index 94d73ee051..2437a64dd0 100644
@@ -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
configs/pico-hobbit-imx7d_defconfig +5 -0
index ef86b0cd66..3467d4c2e4 100644
@@ -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
configs/pico-imx7d_bl33_defconfig +5 -0
index 51d3514072..49a4e1b0c1 100644
@@ -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
configs/pico-imx7d_defconfig +5 -0
index bf4d56ec2c..a1975b9d56 100644
@@ -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
configs/pico-nymph-imx7d_defconfig +5 -0
index 94d73ee051..2437a64dd0 100644
@@ -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
configs/pico-pi-imx7d_defconfig +5 -0
index c6f5b872c3..f1e439602b 100644
@@ -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
include/configs/pico-imx7d.h +0 -11
index 1d0df9dd44..4dc206566e 100644
@@ -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
 
#6 lore raw

PATCH 1/1 pico-imx7d: Convert to DM_ETH

Hi Joris,

Quoted 37 lines · Joris Offouga

Hi Stefano,

Sorry for the delay,

Le 28/12/2019 à 12:31, Stefano Babic a écrit :

Quoted 17 lines

Hi Joris,

Quoted 10 lines · Joris Offouga

---
  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 ------

Quoted 2 lines
  8 files changed, 30 insertions(+), 57 deletions(-)
Quoted 6 lines

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 :

(quoted diff) +0 -3
-CONFIG_USB_ETHER=y
-CONFIG_USB_ETH_CDC=y
-CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
Quoted 1 line

If you agree I send V2

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

Best regards,
Stefano

Quoted 220 lines

Best regards,

Joris

Quoted 215 lines

Best regards,
Stefano

Quoted 211 lines
board/technexion/pico-imx7d/pico-imx7d.c +0 -1
index bcfc7d361e..b7ca2e1315 100644
@@ -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)

board/technexion/pico-imx7d/pico-imx7d.c +0 -3
-#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),

board/technexion/pico-imx7d/pico-imx7d.c +0 -21
-};
-
-#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

board/technexion/pico-imx7d/pico-imx7d.c +0 -2
@@ -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();
configs/pico-dwarf-imx7d_defconfig +0 -0
index 94d73ee051..2437a64dd0 100644
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y

  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_PHYLIB=y

configs/pico-dwarf-imx7d_defconfig +5 -0
+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

configs/pico-hobbit-imx7d_defconfig +0 -0
index ef86b0cd66..3467d4c2e4 100644
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y

  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_PHYLIB=y

configs/pico-hobbit-imx7d_defconfig +5 -0
+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

configs/pico-imx7d_bl33_defconfig +0 -0
index 51d3514072..49a4e1b0c1 100644
@@ -50,6 +50,11 @@ CONFIG_DM_MMC=y

  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_PHYLIB=y

configs/pico-imx7d_bl33_defconfig +5 -0
+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

configs/pico-imx7d_defconfig +0 -0
index bf4d56ec2c..a1975b9d56 100644
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y

  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_PHYLIB=y

configs/pico-imx7d_defconfig +5 -0
+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

configs/pico-nymph-imx7d_defconfig +0 -0
index 94d73ee051..2437a64dd0 100644
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y

  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_PHYLIB=y

configs/pico-nymph-imx7d_defconfig +5 -0
+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

configs/pico-pi-imx7d_defconfig +0 -0
index c6f5b872c3..f1e439602b 100644
@@ -59,6 +59,11 @@ CONFIG_SUPPORT_EMMC_BOOT=y

  CONFIG_FSL_USDHC=y
  CONFIG_MTD=y
  CONFIG_PHYLIB=y

configs/pico-pi-imx7d_defconfig +5 -0
+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

include/configs/pico-imx7d.h +0 -0
index 1d0df9dd44..4dc206566e 100644
@@ -29,17 +29,6 @@
     #define CONFIG_MXC_UART_BASE        UART5_IPS_BASE_ADDR

  -/* Network */

include/configs/pico-imx7d.h +0 -10
-#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

Signature · 5 lines
=====================================================================
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
=====================================================================
#7 lore raw

PATCH 1/1 pico-imx7d: Convert to DM_ETH

Quoted 35 lines · Stefano Babic
Quoted 33 lines · Joris Offouga

Hi Stefano,

Sorry for the delay,

Quoted 17 lines · Stefano Babic

Hi Joris,

Quoted 12 lines · Joris Offouga
---
  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(-)
Quoted 6 lines

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 :

Quoted 7 lines
Quoted 5 lines
(quoted diff) +0 -3
-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.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750
#8 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

In reply to Joris Offouga

Also sync device tree with v5.5-rc1

---
 arch/arm/dts/imx7d-sdb-u-boot.dtsi        |   3 +
 arch/arm/dts/imx7d-sdb.dts                | 785 ++++++++++++++++------
 board/freescale/mx7dsabresd/mx7dsabresd.c |  62 --
 configs/mx7dsabresd_defconfig             |   6 +
 configs/mx7dsabresd_qspi_defconfig        |   6 +
 include/configs/mx7dsabresd.h             |  10 -
 6 files changed, 589 insertions(+), 283 deletions(-)
 create mode 100644 arch/arm/dts/imx7d-sdb-u-boot.dtsi
arch/arm/dts/imx7d-sdb-u-boot.dtsi new file +3 -0
new file mode 100644
index 0000000000..05dd74eee1
@@ -0,0 +1,3 @@
+&fec2 {
+	status = "disable";
+};
arch/arm/dts/imx7d-sdb.dts +574 -211

904 lines not on this page · raw message

board/freescale/mx7dsabresd/mx7dsabresd.c +0 -62

92 lines not on this page · raw message

configs/mx7dsabresd_defconfig +6 -0
index 3dac7136d2..48aa15a199 100644
@@ -56,6 +56,12 @@ CONFIG_MMC_UHS_SUPPORT=y
 CONFIG_MMC_HS200_SUPPORT=y
 CONFIG_FSL_USDHC=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_BROADCOM=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_DM_MDIO_MUX=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
configs/mx7dsabresd_qspi_defconfig +6 -0
index 865ce30dc2..c105560305 100644
@@ -61,6 +61,12 @@ CONFIG_SF_DEFAULT_SPEED=40000000
 CONFIG_SPI_FLASH_EON=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_PHYLIB=y
+CONFIG_PHY_BROADCOM=y
+CONFIG_DM_ETH=y
+CONFIG_DM_MDIO=y
+CONFIG_DM_MDIO_MUX=y
+CONFIG_FEC_MXC=y
+CONFIG_RGMII=y
 CONFIG_MII=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
include/configs/mx7dsabresd.h +0 -10
index 745507571d..f574669644 100644
@@ -17,16 +17,6 @@
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN		(32 * SZ_1M)
 
-/* Network */
-#define CONFIG_FEC_MXC
-#define CONFIG_FEC_XCV_TYPE             RGMII
-#define CONFIG_ETHPRIME                 "FEC"
-#define CONFIG_FEC_MXC_PHYADDR          0
-
-#define CONFIG_PHY_BROADCOM
-/* ENET1 */
-#define IMX_FEC_BASE			ENET_IPS_BASE_ADDR
-
 /* MMC Config*/
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
 
Signature · 1 line
2.20.1
#9 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Quoted 2 lines

Also sync device tree with v5.5-rc1

Applied to u-boot-imx, -next, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
reviewer
#10 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

In reply to Joris Offouga

Hi Joris,

Has this patch been tested on the real hardware?

This is what we currently see:

U-Boot 2020.01-00620-g2d2f91a480 (Jan 20 2020 - 15:41:31 -0300)

CPU:   Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz)
CPU:   Commercial temperature grade (0C to 95C) at 35C
Reset cause: POR
Model: Freescale i.MX7 SabreSD Board
Board: i.MX7D SABRESD in secure mode
DRAM:  1 GiB
MMC:   FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
Loading Environment from MMC... OK
Video: 480x272x24
In:    serial
Out:   serial
Err:   serial
Net:   Could not get PHY for FEC0: addr 0

No ethernet found.

So Ethernet is not functional at all.

Do you plan to fix Ethernet on this board?

Quoted 6 lines · Joris Offouga

Also sync device tree with v5.5-rc1

---
 arch/arm/dts/imx7d-sdb-u-boot.dtsi        |   3 +
 arch/arm/dts/imx7d-sdb.dts                | 785 ++++++++++++++++------

Also, not happy that the dts sync was part of the same commit that converted to DM_ETH.

Thanks

#11 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Hi Fabio,

Le 20/01/2020 à 19:48, Fabio Estevam a écrit :

Quoted 3 lines

Hi Joris,

Has this patch been tested on the real hardware?

I tested and validate it before sending it, there must have been a problem with the merge.

Quoted 24 lines

This is what we currently see:

U-Boot 2020.01-00620-g2d2f91a480 (Jan 20 2020 - 15:41:31 -0300)

CPU:   Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz)
CPU:   Commercial temperature grade (0C to 95C) at 35C
Reset cause: POR
Model: Freescale i.MX7 SabreSD Board
Board: i.MX7D SABRESD in secure mode
DRAM:  1 GiB
MMC:   FSL_SDHC: 0, FSL_SDHC: 1, FSL_SDHC: 2
Loading Environment from MMC... OK
Video: 480x272x24
In:    serial
Out:   serial
Err:   serial
Net:   Could not get PHY for FEC0: addr 0

No ethernet found.

So Ethernet is not functional at all.

Do you plan to fix Ethernet on this board?

Quoted 8 lines
Quoted 5 lines · Joris Offouga

Also sync device tree with v5.5-rc1

---
  arch/arm/dts/imx7d-sdb-u-boot.dtsi        |   3 +
  arch/arm/dts/imx7d-sdb.dts                | 785 ++++++++++++++++------

Also, not happy that the dts sync was part of the same commit that converted to DM_ETH.

Sorry for that indeed I should have made two different commit for this, I have the idea to revert the commit and I will send it split in two

Best regards,

Joris

Quoted 2 lines

Thanks

reviewer
#12 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Hi Joris,

Quoted 2 lines · Joris Offouga

Sorry for that indeed I should have made two different commit for this, I have the idea to revert the commit and I will send it split in two

No need to revert. Let's focus on getting Ethernet to work again :-)

Thanks

#13 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Hi Fabio,

Le 20/01/2020 à 21:22, Fabio Estevam a écrit :

Quoted 7 lines

Hi Joris,

Quoted 2 lines · Joris Offouga

Sorry for that indeed I should have made two different commit for this, I have the idea to revert the commit and I will send it split in two

No need to revert. Let's focus on getting Ethernet to work again :-)

Thanks for your comprehension :-)

I think this bug is similar to the wandboard, I looked at this thread fairly quickly, did you finally fix it?

Thanks

Quoted 2 lines

Thanks

reviewer
#14 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Hi Joris,

Quoted 2 lines · Joris Offouga

I think this bug is similar to the wandboard, I looked at this thread fairly quickly, did you finally fix it?

Which wandboard issue are you referring to?

#15 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Hi Fabio,

Le 20/01/2020 à 21:28, Fabio Estevam a écrit :

Quoted 7 lines

Hi Joris,

Quoted 2 lines · Joris Offouga

I think this bug is similar to the wandboard, I looked at this thread fairly quickly, did you finally fix it?

Which wandboard issue are you referring to?

This thread :
https://lists.denx.de/pipermail/u-boot/2020-January/395560.html

reviewer
#17 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Hi Joris,

Quoted 5 lines · Fabio Estevam

Hi Joris,

On Mon, Jan 20, 2020 at 5:32 PM Joris Offouga <[email protected]> wrote:

Quoted 8 lines
Quoted 2 lines

This thread :
https://lists.denx.de/pipermail/u-boot/2020-January/395560.html

This is an unrelated issue. wandboard support several versions and this issue happens with imx6dl-wandboard-revd1.

Ethernet does not work because revd1 is not properly detected (this is the root cause).

Just to avoid duplicate work: do you plan to fix Ethernet support on this board after DM_ETH conversion?

Thanks

#18 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Hi Fabio,

Quoted 15 lines · Fabio Estevam

Hi Joris,

Quoted 4 lines · Fabio Estevam

Hi Joris,

On Mon, Jan 20, 2020 at 5:32 PM Joris Offouga <[email protected]>

Quoted 7 lines · wrote:
Quoted 3 lines

This thread :
https://lists.denx.de/pipermail/u-boot/2020-January/395560.html

This is an unrelated issue. wandboard support several versions and this issue happens with imx6dl-wandboard-revd1.

Quoted 8 lines
Quoted 2 lines

Ethernet does not work because revd1 is not properly detected (this is the root cause).

Just to avoid duplicate work: do you plan to fix Ethernet support on this board after DM_ETH conversion?

I can't find a fix yet. If you find one it would be great.

Best regards,
Joris

Quoted 3 lines

Thanks

reviewer
#19 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Hi Joris,

Quoted 1 line · Joris OFFOUGA

I can't find a fix yet. If you find one it would be great.

I noticed that the Ethernet regression happens because the ENET_RST_B signal keeps always at 0, which makes the PHY to never becomes active.

The Ethernet PHY reset comes from a GPIO expander (74LV595PW), which is connected to SPI GPIO lines.

Both the GPIO expander driver (CONFIG_DM_74X164) as well as the SPI GPIO driver (CONFIG_SOFT_SPI) are enabled at configs/mx7dsabresd_defconfig.

The device tree has:

&fec1 {
....
phy-reset-gpios = <&extended_io 5 GPIO_ACTIVE_LOW>;

Port 5 of the 74LV595PW is the Ethernet PHY reset pin.

However, this is what we get in U-Boot:

Net: Could not get PHY for FEC0: addr 0
No ethernet found.

Not sure why DM is not properly bringing the Ethernet PHY back to 1.

Any ideas?

Thanks

reviewer
#20 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Quoted 23 lines · Fabio Estevam

Hi Joris,

Quoted 1 line · Joris OFFOUGA

I can't find a fix yet. If you find one it would be great.

I noticed that the Ethernet regression happens because the ENET_RST_B signal keeps always at 0, which makes the PHY to never becomes active.

The Ethernet PHY reset comes from a GPIO expander (74LV595PW), which is connected to SPI GPIO lines.

Both the GPIO expander driver (CONFIG_DM_74X164) as well as the SPI GPIO driver (CONFIG_SOFT_SPI) are enabled at configs/mx7dsabresd_defconfig.

The device tree has:

&fec1 {
....
phy-reset-gpios = <&extended_io 5 GPIO_ACTIVE_LOW>;

Quoted 8 lines

Port 5 of the 74LV595PW is the Ethernet PHY reset pin.

However, this is what we get in U-Boot:

Net: Could not get PHY for FEC0: addr 0
No ethernet found.

Not sure why DM is not properly bringing the Ethernet PHY back to 1.

Running "dm tree" says that soft_spi has not been probed:

spi 0 [ ] soft_spi |-- spi4

Not sure why soft_spi does not get probed though.

The IO expander is on the soft_spi bus, so we need to get soft_spi to get probed first.

Thanks

reviewer
#21 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Quoted 8 lines · Fabio Estevam

Running "dm tree" says that soft_spi has not been probed:

spi 0 [ ] soft_spi |-- spi4

Not sure why soft_spi does not get probed though.

The IO expander is on the soft_spi bus, so we need to get soft_spi to get probed first.

I managed to get Ethernet working again with this patch:
https://lists.denx.de/pipermail/u-boot/2020-January/398438.html

#22 lore raw

PATCH 2/3 mx7dsabre: Enable DM_ETH

Hi Fabio,

Quoted 6 lines · Fabio Estevam
Quoted 4 lines · Fabio Estevam

Running "dm tree" says that soft_spi has not been probed:

spi 0 [ ] soft_spi |-- spi4

Quoted 7 lines
Quoted 4 lines

Not sure why soft_spi does not get probed though.

The IO expander is on the soft_spi bus, so we need to get soft_spi to get probed first.

I managed to get Ethernet working again with this patch:
https://lists.denx.de/pipermail/u-boot/2020-January/398438.html

I good catch, I will test your patch soon
Best regards
Joris Offouga

Quoted 2 lines
#23 lore raw

PATCH 3/3 mx7dsabre: Convert to distroboot support

In reply to Joris Offouga
---
 configs/mx7dsabresd_defconfig      | 13 ++---
 configs/mx7dsabresd_qspi_defconfig | 14 ++---
 include/configs/mx7dsabresd.h      | 84 ++++++------------------------
 3 files changed, 25 insertions(+), 86 deletions(-)
configs/mx7dsabresd_defconfig +4 -9
index 48aa15a199..d15de386fc 100644
@@ -9,13 +9,13 @@ CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 # CONFIG_ARMV7_VIRT is not set
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
+CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_BOUNCE_BUFFER=y
-CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
-CONFIG_CMD_BOOTZ=y
 # CONFIG_BOOTM_NETBSD is not set
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
@@ -30,17 +30,13 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
+# CONFIG_ISO_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -78,7 +74,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/mx7dsabresd_qspi_defconfig +5 -9
index c105560305..b2d5dc1c22 100644
@@ -4,17 +4,18 @@ CONFIG_SYS_TEXT_BASE=0x87800000
 CONFIG_TARGET_MX7DSABRESD=y
 CONFIG_ENV_SIZE=0x2000
 CONFIG_ENV_OFFSET=0xC0000
+CONFIG_NR_DRAM_BANKS=1
 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
 # CONFIG_ARMV7_VIRT is not set
 CONFIG_IMX_RDC=y
 CONFIG_IMX_BOOTAUX=y
+CONFIG_DISTRO_DEFAULTS=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
+CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd"
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_BOUNCE_BUFFER=y
-CONFIG_HUSH_PARSER=y
 # CONFIG_CMD_BOOTD is not set
-CONFIG_CMD_BOOTZ=y
 # CONFIG_BOOTM_NETBSD is not set
 # CONFIG_BOOTM_PLAN9 is not set
 # CONFIG_BOOTM_RTEMS is not set
@@ -29,17 +30,13 @@ CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_USB_MASS_STORAGE=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
-CONFIG_CMD_EXT2=y
-CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_FAT=y
+# CONFIG_ISO_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb-qspi"
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -84,7 +81,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="FSL"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
include/configs/mx7dsabresd.h +16 -68

99 lines not on this page · raw message

Signature · 1 line
2.20.1
#24 lore raw

PATCH 3/3 mx7dsabre: Convert to distroboot support

Quoted 1 line

Applied to u-boot-imx, -next, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#25 lore raw

PATCH 1/3 mx7dsabre: Remove warning about DM_SPI_FLASH

In reply to Joris Offouga
Quoted 2 lines

This defconfig doesn't need it.

Applied to u-boot-imx, -next, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================