Merge branch 'master' of git://git.denx.de/u-boot-usb
- Various fastboot, dwc2/stm32 updates
This commit is contained in:
@@ -240,7 +240,6 @@
|
||||
* add mass storage support and for gadget we add both RNDIS ethernet
|
||||
* and DFU.
|
||||
*/
|
||||
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
|
||||
#define CONFIG_AM335X_USB0
|
||||
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
|
||||
#define CONFIG_AM335X_USB1
|
||||
|
||||
@@ -251,7 +251,6 @@
|
||||
* add mass storage support and for gadget we add both RNDIS ethernet
|
||||
* and DFU.
|
||||
*/
|
||||
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
|
||||
#define CONFIG_AM335X_USB0
|
||||
#define CONFIG_AM335X_USB0_MODE MUSB_HOST
|
||||
#define CONFIG_AM335X_USB1
|
||||
|
||||
@@ -387,7 +387,6 @@ DEFAULT_LINUX_BOOT_ENV \
|
||||
* add mass storage support and for gadget we add both RNDIS ethernet
|
||||
* and DFU.
|
||||
*/
|
||||
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
|
||||
#define CONFIG_AM335X_USB0
|
||||
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
|
||||
#define CONFIG_AM335X_USB1
|
||||
|
||||
@@ -182,9 +182,6 @@ NANDTGTS \
|
||||
#define CONFIG_NAND_OMAP_GPMC_WSCFG 1
|
||||
#endif /* CONFIG_NAND */
|
||||
|
||||
/* USB configuration */
|
||||
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
|
||||
|
||||
#if defined(CONFIG_SPI)
|
||||
/* SPI Flash */
|
||||
#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000
|
||||
|
||||
@@ -68,9 +68,6 @@ BUR_COMMON_ENV \
|
||||
#define CONFIG_SETUP_MEMORY_TAGS
|
||||
#define CONFIG_INITRD_TAG
|
||||
|
||||
/* USB configuration */
|
||||
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
|
||||
|
||||
/* Environment */
|
||||
#define CONFIG_SYS_MMC_ENV_DEV 1
|
||||
#define CONFIG_SYS_MMC_ENV_PART 2
|
||||
|
||||
@@ -148,7 +148,6 @@
|
||||
|
||||
/* USB configuration */
|
||||
#define CONFIG_ARCH_MISC_INIT
|
||||
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
|
||||
#define CONFIG_AM335X_USB1
|
||||
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
|
||||
|
||||
|
||||
@@ -157,7 +157,6 @@
|
||||
* board schematic and physical port wired to each. Then for host we
|
||||
* add mass storage support.
|
||||
*/
|
||||
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
|
||||
#define CONFIG_AM335X_USB0
|
||||
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
|
||||
#define CONFIG_AM335X_USB1
|
||||
|
||||
@@ -150,8 +150,6 @@
|
||||
/*
|
||||
* USB configuration
|
||||
*/
|
||||
#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
|
||||
|
||||
#define CONFIG_AM335X_USB0
|
||||
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
|
||||
#define CONFIG_AM335X_USB1
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#define __DWC2_USB_GADGET
|
||||
|
||||
#define PHY0_SLEEP (1 << 5)
|
||||
#define DWC2_MAX_HW_ENDPOINTS 16
|
||||
|
||||
struct dwc2_plat_otg_data {
|
||||
void *priv;
|
||||
@@ -22,8 +23,14 @@ struct dwc2_plat_otg_data {
|
||||
unsigned int rx_fifo_sz;
|
||||
unsigned int np_tx_fifo_sz;
|
||||
unsigned int tx_fifo_sz;
|
||||
unsigned int tx_fifo_sz_array[DWC2_MAX_HW_ENDPOINTS];
|
||||
unsigned char tx_fifo_sz_nb;
|
||||
bool force_b_session_valid;
|
||||
bool activate_stm_id_vb_detection;
|
||||
};
|
||||
|
||||
int dwc2_udc_probe(struct dwc2_plat_otg_data *pdata);
|
||||
|
||||
int dwc2_udc_B_session_valid(struct udevice *dev);
|
||||
|
||||
#endif /* __DWC2_USB_GADGET */
|
||||
|
||||
Reference in New Issue
Block a user