diff options
author | Tom Rini <trini@konsulko.com> | 2015-07-24 16:39:56 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-07-24 16:39:56 -0400 |
commit | 6f4e050639241218987541f4729172e4e0e2ff31 (patch) | |
tree | 0b7555fa699540dc975d179551211dd95c650a46 /include/configs/bav335x.h | |
parent | 5a9749ee12bed44ca4dc7f2412b5a340db666954 (diff) | |
parent | 58d6d139c3e7bb923029e7ba18bfec7f420ead0f (diff) |
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'include/configs/bav335x.h')
-rw-r--r-- | include/configs/bav335x.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 741fb05a7d2..fa32fa43d15 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -444,7 +444,7 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_MUSB_PIO_ONLY #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_MUSB_HOST @@ -455,10 +455,11 @@ DEFAULT_LINUX_BOOT_ENV \ #ifndef CONFIG_SPL_USBETH_SUPPORT /* Fastboot */ +#define CONFIG_USB_FUNCTION_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 +#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR +#define CONFIG_FASTBOOT_BUF_SIZE 0x07000000 /* To support eMMC booting */ #define CONFIG_STORAGE_EMMC @@ -472,7 +473,7 @@ DEFAULT_LINUX_BOOT_ENV \ #ifdef CONFIG_MUSB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_USB_FUNCTION_MASS_STORAGE /* USB TI's IDs */ #define CONFIG_G_DNL_VENDOR_NUM 0x0451 @@ -494,7 +495,7 @@ DEFAULT_LINUX_BOOT_ENV \ /* USB Device Firmware Update support */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC #define CONFIG_CMD_DFU #define DFU_ALT_INFO_MMC \ |