LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MLK-19625 mx6ulz_evk: Disable the FEC driver and support USB2NET dongle 

Since the mx6ulz don't have FEC, it needs to use USB2NET dongle
to connect network. We decouple the CONFIG_FEC_MXC with CONFIG_CMD_NET.
For 6ull, all defconfigs need to enable the CONFIG_FEC_MXC explicitly.

Another change is adding ${usb_net_cmd} environment for usb start command
in netboot scripts on 6ulz.

Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Ye Li 2018-09-19 18:39:30 -07:00
parent 4a5895bb20
commit 9018cc2ba3
15 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/freescale/mx6ullevk/mx6ullevk.c
View File

@ -502,8 +502,10 @@ int board_late_init(void)
else else
env_set("board_rev", "14X14"); env_set("board_rev", "14X14");
if (is_cpu_type(MXC_CPU_MX6ULZ)) if (is_cpu_type(MXC_CPU_MX6ULZ)) {
env_set("fdt_file", "imx6ulz-14x14-evk.dtb"); env_set("fdt_file", "imx6ulz-14x14-evk.dtb");
env_set("usb_net_cmd", "usb start");
}
#endif #endif
#ifdef CONFIG_ENV_IS_IN_MMC #ifdef CONFIG_ENV_IS_IN_MMC

1
configs/mx6ull_14x14_evk_defconfig
View File

@ -50,6 +50,7 @@ CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_CMD_FASTBOOT=y CONFIG_CMD_FASTBOOT=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y

1
configs/mx6ull_14x14_evk_emmc_defconfig
View File

@ -50,6 +50,7 @@ CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_CMD_FASTBOOT=y CONFIG_CMD_FASTBOOT=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y

1
configs/mx6ull_14x14_evk_nand_defconfig
View File

@ -46,3 +46,4 @@ CONFIG_DM_SPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y

1
configs/mx6ull_14x14_evk_optee_defconfig
View File

@ -51,6 +51,7 @@ CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_CMD_FASTBOOT=y CONFIG_CMD_FASTBOOT=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y

1
configs/mx6ull_14x14_evk_plugin_defconfig
View File

@ -51,6 +51,7 @@ CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_CMD_FASTBOOT=y CONFIG_CMD_FASTBOOT=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y

1
configs/mx6ull_14x14_evk_qspi1_defconfig
View File

@ -51,3 +51,4 @@ CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y

1
configs/mx6ull_9x9_evk_defconfig
View File

@ -53,6 +53,7 @@ CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_CMD_FASTBOOT=y CONFIG_CMD_FASTBOOT=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y

1
configs/mx6ull_9x9_evk_plugin_defconfig
View File

@ -54,6 +54,7 @@ CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_CMD_FASTBOOT=y CONFIG_CMD_FASTBOOT=y
CONFIG_CI_UDC=y CONFIG_CI_UDC=y

1
configs/mx6ull_9x9_evk_qspi1_defconfig
View File

@ -55,6 +55,7 @@ CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_FEC_MXC=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_MANUFACTURER="FSL"

1
configs/mx6ulz_14x14_evk_defconfig
View File

@ -45,6 +45,7 @@ CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_FSL_QSPI=y CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y

1
configs/mx6ulz_14x14_evk_emmc_defconfig
View File

@ -45,6 +45,7 @@ CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_FSL_QSPI=y CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y

1
configs/mx6ulz_14x14_evk_nand_defconfig
View File

@ -42,6 +42,7 @@ CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y

1
configs/mx6ulz_14x14_evk_qspi1_defconfig
View File

@ -46,6 +46,7 @@ CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y
CONFIG_USB_HOST_ETHER=y CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_FSL_QSPI=y CONFIG_FSL_QSPI=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y

5
include/configs/mx6ullevk.h
View File

@ -168,6 +168,7 @@
"root=/dev/nfs " \ "root=/dev/nfs " \
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
"netboot=echo Booting from net ...; " \ "netboot=echo Booting from net ...; " \
"${usb_net_cmd}; " \
"run netargs; " \ "run netargs; " \
"if test ${ip_dyn} = yes; then " \ "if test ${ip_dyn} = yes; then " \
"setenv get_cmd dhcp; " \ "setenv get_cmd dhcp; " \
@ -298,9 +299,7 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#endif #endif
#ifdef CONFIG_CMD_NET #ifdef CONFIG_FEC_MXC
#define CONFIG_CMD_MII
#define CONFIG_FEC_MXC
#define CONFIG_MII #define CONFIG_MII
#define CONFIG_FEC_ENET_DEV 1 #define CONFIG_FEC_ENET_DEV 1