Clean up include/configs/am43xx_evm.h and add configs to support USB device boot for am43xx evm.
Signed-off-by: Vignesh R vigneshr@ti.com --- configs/am43xx_evm_defconfig | 13 ++++++++++++- include/configs/am43xx_evm.h | 27 ++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 4d9ec8841f8a..fc0bbdc4df71 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -22,7 +22,7 @@ CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" CONFIG_DM=y -# CONFIG_BLK is not set +CONFIG_BLK=y CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y CONFIG_DFU_SF=y @@ -50,3 +50,14 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0403 CONFIG_G_DNL_PRODUCT_NUM=0xbd00 +CONFIG_MISC=y +CONFIG_DM_USB=y +CONFIG_CMD_USB=y +CONFIG_DM_ETH=y +CONFIG_SPL_USBETH_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 1d8e39c20352..96cb45108056 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -89,20 +89,6 @@ #define CONFIG_AM437X_USB2PHY2_HOST #endif
-#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT) -#undef CONFIG_USB_DWC3_PHY_OMAP -#undef CONFIG_USB_DWC3_OMAP -#undef CONFIG_USB_DWC3 -#undef CONFIG_USB_DWC3_GADGET - -#undef CONFIG_USB_GADGET_DOWNLOAD -#undef CONFIG_USB_GADGET_VBUS_DRAW -#undef CONFIG_G_DNL_MANUFACTURER -#undef CONFIG_G_DNL_VENDOR_NUM -#undef CONFIG_G_DNL_PRODUCT_NUM -#undef CONFIG_USB_GADGET_DUALSPEED -#endif - /* * Disable MMC DM for SPL build and can be re-enabled after adding * DM support in SPL @@ -257,11 +243,6 @@ #define CONFIG_PHYLIB #define PHY_ANEG_TIMEOUT 8000 /* PHY needs longer aneg time at 1G */
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ETH_SUPPORT) -#undef CONFIG_ENV_IS_IN_FAT -#define CONFIG_ENV_IS_NOWHERE -#endif - #define CONFIG_SYS_RX_ETH_BUFFER 64
/* NAND support */ @@ -346,4 +327,12 @@ #define NANDBOOT #endif /* CONFIG_NAND */
+#define CONFIG_ARCH_MISC_INIT + +#ifdef CONFIG_SPL_USBETH_SUPPORT +#define CONFIG_USB_ETHER +#define CONFIG_USB_ETH_RNDIS +#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" +#endif + #endif /* __CONFIG_AM43XX_EVM_H */