| Message ID | 20200127001528.207065-2-marex@denx.de |
|---|---|
| State | Accepted |
| Commit | b91f28de83ee975650f69766208fedb7489391e2 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [1/3] ARM: imx: novena: Move defconfig bits to arch Kconfig | expand |
> Convert to DM ethernet to prevent board removal. > Signed-off-by: Marek Vasut <marex@denx.de> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > Cc: Vagrant Cascadian <vagrant@debian.org> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 811c41d906..f9f576d403 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -259,6 +259,7 @@ config TARGET_GW_VENTANA config TARGET_KOSAGI_NOVENA bool "Kosagi Novena" select BOARD_LATE_INIT + select DM_ETH select DM_GPIO select DM_MMC select DM_PCI diff --git a/configs/novena_defconfig b/configs/novena_defconfig index 2fd89b2939..b20bbab454 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -53,6 +53,8 @@ CONFIG_FSL_USDHC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y +CONFIG_FEC_MXC=y +CONFIG_RGMII=y CONFIG_MII=y CONFIG_PCI=y CONFIG_PINCTRL=y diff --git a/include/configs/novena.h b/include/configs/novena.h index c03b8db2ba..2b8419563c 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -53,13 +53,8 @@ #include "imx6_spl.h" /* common IMX6 SPL configuration */ /* Ethernet Configuration */ -#ifdef CONFIG_CMD_NET -#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 0x7 -#define CONFIG_ARP_TIMEOUT 200UL +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_DM_ETH #endif /* I2C */
Convert to DM ethernet to prevent board removal. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> Cc: Vagrant Cascadian <vagrant@debian.org> --- arch/arm/mach-imx/mx6/Kconfig | 1 + configs/novena_defconfig | 2 ++ include/configs/novena.h | 9 ++------- 3 files changed, 5 insertions(+), 7 deletions(-)