From aa898095b527a2f90d16dd039646eff8009a62f6 Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Wed, 16 Nov 2016 14:07:53 +0800 Subject: [PATCH] MLK-13547 configs: mx7ulp_evk: enable ethernet boot support Since we can use USB ethernet instead of local ethernet, add ethernet support for it. To use USB ethernet function at u-boot, just plug in Micro-AB cable at USBOTG1 port with USB2Ethernet adapter connected. Signed-off-by: Peter Chen (cherry picked from commit 60ffddf87cf6b8502c5d5fc6540364adfd66ebb3) Signed-off-by: Ye Li (cherry picked from commit 63c2e1de37e1e24f35279f50efa5a330e2cb3d07) (cherry picked from commit c82f3bef0aa0cba4937eb6c39501e446dca01746) (cherry picked from commit b9d238f6e240e189299e49654ca3abf53e92cb28) (cherry picked from commit a99fd1b215cf176377a8e0a35d9bbe7b080cae13) (cherry picked from commit d261a139c946f3117aef9cdbbbe78b8f46d61952) --- configs/mx7ulp_evk_defconfig | 4 +++- configs/mx7ulp_evk_plugin_defconfig | 5 ++++- include/configs/mx7ulp_evk.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index 8f7f406141..49372820dd 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -21,11 +21,12 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -# CONFIG_NET is not set CONFIG_DM=y CONFIG_BOUNCE_BUFFER=y CONFIG_IMX_RGPIO2P=y @@ -64,3 +65,4 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_RTL8152=y +CONFIG_DM_ETH=y diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index 907744116f..bd4b620ba7 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -13,6 +13,7 @@ CONFIG_USE_IMXIMG_PLUGIN=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7ulp_evk/imximage.cfg" CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y @@ -20,11 +21,12 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y +CONFIG_CMD_PING=y +CONFIG_CMD_DHCP=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -# CONFIG_NET is not set CONFIG_DM=y CONFIG_BOUNCE_BUFFER=y CONFIG_IMX_RGPIO2P=y @@ -63,3 +65,4 @@ CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y CONFIG_USB_ETHER_RTL8152=y +CONFIG_DM_ETH=y diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index f1c2be5c0c..40eebd641f 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -120,6 +120,7 @@ "else " \ "if run loadimage; then " \ "run mmcboot; " \ + "else run netboot; " \ "fi; " \ "fi; " \ "fi" -- 2.17.1