Eric Lee / smarc-uboot

2
Download as
Browse Code ยป

Commit 9018cc2ba39d079625c6856347c787bb8642c270

Authored by Ye Li
1 parent 4a5895bb20
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 5 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

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>

Showing 15 changed files with 18 additions and 4 deletions Side-by-side Diff

board/freescale/mx6ullevk/mx6ullevk.c
Diff comments   View file @ 9018cc2
... ... @@ -502,8 +502,10 @@
502 502 else
503 503 env_set("board_rev", "14X14");
504 504  
505   - if (is_cpu_type(MXC_CPU_MX6ULZ))
  505 + if (is_cpu_type(MXC_CPU_MX6ULZ)) {
506 506 env_set("fdt_file", "imx6ulz-14x14-evk.dtb");
  507 + env_set("usb_net_cmd", "usb start");
  508 + }
507 509 #endif
508 510  
509 511 #ifdef CONFIG_ENV_IS_IN_MMC
configs/mx6ull_14x14_evk_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -50,6 +50,7 @@
50 50 CONFIG_DM_ETH=y
51 51 CONFIG_PHYLIB=y
52 52 CONFIG_PHY_MICREL=y
  53 +CONFIG_FEC_MXC=y
53 54  
54 55 CONFIG_CMD_FASTBOOT=y
55 56 CONFIG_CI_UDC=y
configs/mx6ull_14x14_evk_emmc_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -50,6 +50,7 @@
50 50 CONFIG_DM_ETH=y
51 51 CONFIG_PHYLIB=y
52 52 CONFIG_PHY_MICREL=y
  53 +CONFIG_FEC_MXC=y
53 54  
54 55 CONFIG_CMD_FASTBOOT=y
55 56 CONFIG_CI_UDC=y
configs/mx6ull_14x14_evk_nand_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -46,4 +46,5 @@
46 46 CONFIG_DM_ETH=y
47 47 CONFIG_PHYLIB=y
48 48 CONFIG_PHY_MICREL=y
  49 +CONFIG_FEC_MXC=y
configs/mx6ull_14x14_evk_optee_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -51,6 +51,7 @@
51 51 CONFIG_DM_ETH=y
52 52 CONFIG_PHYLIB=y
53 53 CONFIG_PHY_MICREL=y
  54 +CONFIG_FEC_MXC=y
54 55  
55 56 CONFIG_CMD_FASTBOOT=y
56 57 CONFIG_CI_UDC=y
configs/mx6ull_14x14_evk_plugin_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -51,6 +51,7 @@
51 51 CONFIG_DM_ETH=y
52 52 CONFIG_PHYLIB=y
53 53 CONFIG_PHY_MICREL=y
  54 +CONFIG_FEC_MXC=y
54 55  
55 56 CONFIG_CMD_FASTBOOT=y
56 57 CONFIG_CI_UDC=y
configs/mx6ull_14x14_evk_qspi1_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -51,4 +51,5 @@
51 51 CONFIG_DM_ETH=y
52 52 CONFIG_PHYLIB=y
53 53 CONFIG_PHY_MICREL=y
  54 +CONFIG_FEC_MXC=y
configs/mx6ull_9x9_evk_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -53,6 +53,7 @@
53 53 CONFIG_DM_ETH=y
54 54 CONFIG_PHYLIB=y
55 55 CONFIG_PHY_MICREL=y
  56 +CONFIG_FEC_MXC=y
56 57  
57 58 CONFIG_CMD_FASTBOOT=y
58 59 CONFIG_CI_UDC=y
configs/mx6ull_9x9_evk_plugin_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -54,6 +54,7 @@
54 54 CONFIG_DM_ETH=y
55 55 CONFIG_PHYLIB=y
56 56 CONFIG_PHY_MICREL=y
  57 +CONFIG_FEC_MXC=y
57 58  
58 59 CONFIG_CMD_FASTBOOT=y
59 60 CONFIG_CI_UDC=y
configs/mx6ull_9x9_evk_qspi1_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -55,6 +55,7 @@
55 55 CONFIG_DM_ETH=y
56 56 CONFIG_PHYLIB=y
57 57 CONFIG_PHY_MICREL=y
  58 +CONFIG_FEC_MXC=y
58 59  
59 60 CONFIG_USB_GADGET=y
60 61 CONFIG_USB_GADGET_MANUFACTURER="FSL"
configs/mx6ulz_14x14_evk_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -45,6 +45,7 @@
45 45 CONFIG_USB_STORAGE=y
46 46 CONFIG_USB_HOST_ETHER=y
47 47 CONFIG_USB_ETHER_ASIX=y
  48 +CONFIG_USB_ETHER_RTL8152=y
48 49 CONFIG_DM_SPI=y
49 50 CONFIG_FSL_QSPI=y
50 51 CONFIG_DM_ETH=y
configs/mx6ulz_14x14_evk_emmc_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -45,6 +45,7 @@
45 45 CONFIG_USB_STORAGE=y
46 46 CONFIG_USB_HOST_ETHER=y
47 47 CONFIG_USB_ETHER_ASIX=y
  48 +CONFIG_USB_ETHER_RTL8152=y
48 49 CONFIG_DM_SPI=y
49 50 CONFIG_FSL_QSPI=y
50 51 CONFIG_DM_ETH=y
configs/mx6ulz_14x14_evk_nand_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -42,6 +42,7 @@
42 42 CONFIG_USB_STORAGE=y
43 43 CONFIG_USB_HOST_ETHER=y
44 44 CONFIG_USB_ETHER_ASIX=y
  45 +CONFIG_USB_ETHER_RTL8152=y
45 46 CONFIG_DM_SPI=y
46 47 CONFIG_DM_ETH=y
47 48 CONFIG_PHYLIB=y
configs/mx6ulz_14x14_evk_qspi1_defconfig
Diff comments   View file @ 9018cc2
... ... @@ -46,6 +46,7 @@
46 46 CONFIG_USB_STORAGE=y
47 47 CONFIG_USB_HOST_ETHER=y
48 48 CONFIG_USB_ETHER_ASIX=y
  49 +CONFIG_USB_ETHER_RTL8152=y
49 50 CONFIG_DM_SPI=y
50 51 CONFIG_FSL_QSPI=y
51 52 CONFIG_DM_ETH=y
include/configs/mx6ullevk.h
Diff comments   View file @ 9018cc2
... ... @@ -168,6 +168,7 @@
168 168 "root=/dev/nfs " \
169 169 "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
170 170 "netboot=echo Booting from net ...; " \
  171 + "${usb_net_cmd}; " \
171 172 "run netargs; " \
172 173 "if test ${ip_dyn} = yes; then " \
173 174 "setenv get_cmd dhcp; " \
... ... @@ -298,9 +299,7 @@
298 299 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
299 300 #endif
300 301  
301   -#ifdef CONFIG_CMD_NET
302   -#define CONFIG_CMD_MII
303   -#define CONFIG_FEC_MXC
  302 +#ifdef CONFIG_FEC_MXC
304 303 #define CONFIG_MII
305 304 #define CONFIG_FEC_ENET_DEV 1
306 305