On Wed, Oct 29, 2014 at 05:07:11AM +0530, Dileep Katta wrote:
Signed-off-by: Dileep Katta dileep.katta@linaro.org
After re-working things like this (so that am335x_evm_usbspl still builds):
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7c83e3b..560e3bf 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -314,12 +314,18 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
+#ifndef CONFIG_SPL_USBETH_SUPPORT /* Fastboot */ #define CONFIG_CMD_FASTBOOT #define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_USB_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_USB_FASTBOOT_BUF_SIZE 0x07000000
+/* To support eMMC booting */ +#define CONFIG_STORAGE_EMMC +#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 +#endif + #ifdef CONFIG_MUSB_HOST #define CONFIG_CMD_USB #define CONFIG_USB_STORAGE @@ -330,10 +336,6 @@ #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00"
-/*To support eMMC booting*/ -#define CONFIG_STORAGE_EMMC -#define CONFIG_FASTBOOT_FLASH_MMC_DEV 1 - /* USB TI's IDs */ #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xD022
Applied to u-boot-ti/master, thanks!