From 9018cc2ba39d079625c6856347c787bb8642c270 Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 19 Sep 2018 18:39:30 -0700 Subject: 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 Reviewed-by: Peng Fan --- board/freescale/mx6ullevk/mx6ullevk.c | 4 +++- configs/mx6ull_14x14_evk_defconfig | 1 + configs/mx6ull_14x14_evk_emmc_defconfig | 1 + configs/mx6ull_14x14_evk_nand_defconfig | 1 + configs/mx6ull_14x14_evk_optee_defconfig | 1 + configs/mx6ull_14x14_evk_plugin_defconfig | 1 + configs/mx6ull_14x14_evk_qspi1_defconfig | 1 + configs/mx6ull_9x9_evk_defconfig | 1 + configs/mx6ull_9x9_evk_plugin_defconfig | 1 + configs/mx6ull_9x9_evk_qspi1_defconfig | 1 + configs/mx6ulz_14x14_evk_defconfig | 1 + configs/mx6ulz_14x14_evk_emmc_defconfig | 1 + configs/mx6ulz_14x14_evk_nand_defconfig | 1 + configs/mx6ulz_14x14_evk_qspi1_defconfig | 1 + include/configs/mx6ullevk.h | 5 ++--- 15 files changed, 18 insertions(+), 4 deletions(-) diff --git a/board/freescale/mx6ullevk/mx6ullevk.c b/board/freescale/mx6ullevk/mx6ullevk.c index 6f6c225337..8465262c8a 100644 --- a/board/freescale/mx6ullevk/mx6ullevk.c +++ b/board/freescale/mx6ullevk/mx6ullevk.c @@ -502,8 +502,10 @@ int board_late_init(void) else 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("usb_net_cmd", "usb start"); + } #endif #ifdef CONFIG_ENV_IS_IN_MMC diff --git a/configs/mx6ull_14x14_evk_defconfig b/configs/mx6ull_14x14_evk_defconfig index 7ca7cfc691..2d9618c83c 100644 --- a/configs/mx6ull_14x14_evk_defconfig +++ b/configs/mx6ull_14x14_evk_defconfig @@ -50,6 +50,7 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_CMD_FASTBOOT=y CONFIG_CI_UDC=y diff --git a/configs/mx6ull_14x14_evk_emmc_defconfig b/configs/mx6ull_14x14_evk_emmc_defconfig index b862db7839..d056b5ab72 100644 --- a/configs/mx6ull_14x14_evk_emmc_defconfig +++ b/configs/mx6ull_14x14_evk_emmc_defconfig @@ -50,6 +50,7 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_CMD_FASTBOOT=y CONFIG_CI_UDC=y diff --git a/configs/mx6ull_14x14_evk_nand_defconfig b/configs/mx6ull_14x14_evk_nand_defconfig index 58c805c018..38f2dcf304 100644 --- a/configs/mx6ull_14x14_evk_nand_defconfig +++ b/configs/mx6ull_14x14_evk_nand_defconfig @@ -46,3 +46,4 @@ CONFIG_DM_SPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y diff --git a/configs/mx6ull_14x14_evk_optee_defconfig b/configs/mx6ull_14x14_evk_optee_defconfig index 11f846bb17..f93e48ac28 100644 --- a/configs/mx6ull_14x14_evk_optee_defconfig +++ b/configs/mx6ull_14x14_evk_optee_defconfig @@ -51,6 +51,7 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_CMD_FASTBOOT=y CONFIG_CI_UDC=y diff --git a/configs/mx6ull_14x14_evk_plugin_defconfig b/configs/mx6ull_14x14_evk_plugin_defconfig index e57cd5da96..a2f6f54aaa 100644 --- a/configs/mx6ull_14x14_evk_plugin_defconfig +++ b/configs/mx6ull_14x14_evk_plugin_defconfig @@ -51,6 +51,7 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_CMD_FASTBOOT=y CONFIG_CI_UDC=y diff --git a/configs/mx6ull_14x14_evk_qspi1_defconfig b/configs/mx6ull_14x14_evk_qspi1_defconfig index efdc575e7e..142301e45a 100644 --- a/configs/mx6ull_14x14_evk_qspi1_defconfig +++ b/configs/mx6ull_14x14_evk_qspi1_defconfig @@ -51,3 +51,4 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y diff --git a/configs/mx6ull_9x9_evk_defconfig b/configs/mx6ull_9x9_evk_defconfig index b3e0892731..b9e6c6ca17 100644 --- a/configs/mx6ull_9x9_evk_defconfig +++ b/configs/mx6ull_9x9_evk_defconfig @@ -53,6 +53,7 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_CMD_FASTBOOT=y CONFIG_CI_UDC=y diff --git a/configs/mx6ull_9x9_evk_plugin_defconfig b/configs/mx6ull_9x9_evk_plugin_defconfig index 82dcf34c36..8aa1348087 100644 --- a/configs/mx6ull_9x9_evk_plugin_defconfig +++ b/configs/mx6ull_9x9_evk_plugin_defconfig @@ -54,6 +54,7 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_CMD_FASTBOOT=y CONFIG_CI_UDC=y diff --git a/configs/mx6ull_9x9_evk_qspi1_defconfig b/configs/mx6ull_9x9_evk_qspi1_defconfig index e23e3b9349..3fad8a6e35 100644 --- a/configs/mx6ull_9x9_evk_qspi1_defconfig +++ b/configs/mx6ull_9x9_evk_qspi1_defconfig @@ -55,6 +55,7 @@ CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_FEC_MXC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" diff --git a/configs/mx6ulz_14x14_evk_defconfig b/configs/mx6ulz_14x14_evk_defconfig index 6423e53a9d..370a9c327b 100644 --- a/configs/mx6ulz_14x14_evk_defconfig +++ b/configs/mx6ulz_14x14_evk_defconfig @@ -45,6 +45,7 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_RTL8152=y CONFIG_DM_SPI=y CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y diff --git a/configs/mx6ulz_14x14_evk_emmc_defconfig b/configs/mx6ulz_14x14_evk_emmc_defconfig index f1c80bb6d4..5e0f92eb4a 100644 --- a/configs/mx6ulz_14x14_evk_emmc_defconfig +++ b/configs/mx6ulz_14x14_evk_emmc_defconfig @@ -45,6 +45,7 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_RTL8152=y CONFIG_DM_SPI=y CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y diff --git a/configs/mx6ulz_14x14_evk_nand_defconfig b/configs/mx6ulz_14x14_evk_nand_defconfig index ccb53df7eb..4bbd47e0c4 100644 --- a/configs/mx6ulz_14x14_evk_nand_defconfig +++ b/configs/mx6ulz_14x14_evk_nand_defconfig @@ -42,6 +42,7 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_RTL8152=y CONFIG_DM_SPI=y CONFIG_DM_ETH=y CONFIG_PHYLIB=y diff --git a/configs/mx6ulz_14x14_evk_qspi1_defconfig b/configs/mx6ulz_14x14_evk_qspi1_defconfig index bf3f633bdd..5285cf4156 100644 --- a/configs/mx6ulz_14x14_evk_qspi1_defconfig +++ b/configs/mx6ulz_14x14_evk_qspi1_defconfig @@ -46,6 +46,7 @@ CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_RTL8152=y CONFIG_DM_SPI=y CONFIG_FSL_QSPI=y CONFIG_DM_ETH=y diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h index 9873c18573..d811c86ec6 100644 --- a/include/configs/mx6ullevk.h +++ b/include/configs/mx6ullevk.h @@ -168,6 +168,7 @@ "root=/dev/nfs " \ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ "netboot=echo Booting from net ...; " \ + "${usb_net_cmd}; " \ "run netargs; " \ "if test ${ip_dyn} = yes; then " \ "setenv get_cmd dhcp; " \ @@ -298,9 +299,7 @@ #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #endif -#ifdef CONFIG_CMD_NET -#define CONFIG_CMD_MII -#define CONFIG_FEC_MXC +#ifdef CONFIG_FEC_MXC #define CONFIG_MII #define CONFIG_FEC_ENET_DEV 1 -- cgit v1.2.3