OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision319d309b58f863cbb8dcb240ace6af17dc98939b (tree)
Time2022-07-20 04:54:57
AuthorTom Rini <trini@kons...>
CommiterTom Rini

Log Message

Merge https://source.denx.de/u-boot/custodians/u-boot-usb

Change Summary

Incremental Difference

--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -69,6 +69,7 @@ CONFIG_DFU_MMC=y
6969 CONFIG_DFU_RAM=y
7070 CONFIG_DFU_SF=y
7171 CONFIG_MISC=y
72+CONFIG_SPL_MISC=y
7273 CONFIG_SYS_I2C_EEPROM_ADDR=0x50
7374 CONFIG_MMC_OMAP_HS=y
7475 CONFIG_MTD=y
@@ -103,6 +104,7 @@ CONFIG_USB_XHCI_OMAP=y
103104 CONFIG_USB_DWC3=y
104105 CONFIG_USB_DWC3_OMAP=y
105106 CONFIG_USB_DWC3_GENERIC=y
107+CONFIG_SPL_USB_DWC3_GENERIC=y
106108 CONFIG_USB_DWC3_PHY_OMAP=y
107109 CONFIG_USB_GADGET=y
108110 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -8,6 +8,7 @@ CONFIG_DM_GPIO=y
88 CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
99 CONFIG_AM43XX=y
1010 CONFIG_SPL=y
11+CONFIG_SPL_MISC=y
1112 CONFIG_DISTRO_DEFAULTS=y
1213 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
1314 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4033ff00
@@ -104,6 +105,7 @@ CONFIG_USB_XHCI_OMAP=y
104105 CONFIG_USB_DWC3=y
105106 CONFIG_USB_DWC3_OMAP=y
106107 CONFIG_USB_DWC3_GENERIC=y
108+CONFIG_SPL_USB_DWC3_GENERIC=y
107109 CONFIG_USB_DWC3_PHY_OMAP=y
108110 CONFIG_USB_GADGET=y
109111 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -15,6 +15,7 @@ CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
1515 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
1616 CONFIG_SPL_DRIVERS_MISC=y
1717 CONFIG_SPL=y
18+CONFIG_SPL_MISC=y
1819 CONFIG_DISTRO_DEFAULTS=y
1920 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
2021 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4033ff00
@@ -102,6 +103,7 @@ CONFIG_USB_XHCI_OMAP=y
102103 CONFIG_USB_DWC3=y
103104 CONFIG_USB_DWC3_OMAP=y
104105 CONFIG_USB_DWC3_GENERIC=y
106+CONFIG_SPL_USB_DWC3_GENERIC=y
105107 CONFIG_USB_DWC3_PHY_OMAP=y
106108 CONFIG_USB_GADGET=y
107109 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
--- a/configs/am57xx_hs_evm_usb_defconfig
+++ b/configs/am57xx_hs_evm_usb_defconfig
@@ -14,6 +14,7 @@ CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
1414 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
1515 CONFIG_TARGET_AM57XX_EVM=y
1616 CONFIG_SPL=y
17+CONFIG_SPL_MISC=y
1718 CONFIG_ENV_OFFSET_REDUND=0x280000
1819 CONFIG_SPL_SPI_FLASH_SUPPORT=y
1920 CONFIG_SPL_SPI=y
@@ -121,6 +122,7 @@ CONFIG_USB_XHCI_DWC3=y
121122 CONFIG_USB_XHCI_OMAP=y
122123 CONFIG_USB_DWC3=y
123124 CONFIG_USB_DWC3_GENERIC=y
125+CONFIG_SPL_USB_DWC3_GENERIC=y
124126 CONFIG_USB_GADGET=y
125127 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
126128 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -12,6 +12,7 @@ CONFIG_ENV_SIZE=0x20000
1212 CONFIG_ENV_OFFSET=0x680000
1313 CONFIG_DM_GPIO=y
1414 CONFIG_SPL_DM_SPI=y
15+CONFIG_SPL_MISC=y
1516 CONFIG_DEFAULT_DEVICE_TREE="k3-am654-base-board"
1617 CONFIG_SPL_TEXT_BASE=0x80080000
1718 CONFIG_SPL_MMC=y
@@ -173,6 +174,7 @@ CONFIG_USB_XHCI_HCD=y
173174 CONFIG_USB_XHCI_DWC3=y
174175 CONFIG_USB_DWC3=y
175176 CONFIG_USB_DWC3_GENERIC=y
177+CONFIG_SPL_USB_DWC3_GENERIC=y
176178 CONFIG_USB_KEYBOARD=y
177179 CONFIG_USB_GADGET=y
178180 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
--- a/configs/am65x_evm_r5_usbdfu_defconfig
+++ b/configs/am65x_evm_r5_usbdfu_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_K3=y
33 CONFIG_SYS_MALLOC_LEN=0x2000000
44 CONFIG_SYS_MALLOC_F_LEN=0x55000
55 CONFIG_SPL_GPIO=y
6+CONFIG_SPL_MISC=y
67 CONFIG_SPL_LIBCOMMON_SUPPORT=y
78 CONFIG_SPL_LIBGENERIC_SUPPORT=y
89 CONFIG_NR_DRAM_BANKS=2
@@ -128,6 +129,7 @@ CONFIG_USB_XHCI_HCD=y
128129 CONFIG_USB_XHCI_DWC3=y
129130 CONFIG_USB_DWC3=y
130131 CONFIG_USB_DWC3_GENERIC=y
132+CONFIG_SPL_USB_DWC3_GENERIC=y
131133 CONFIG_USB_STORAGE=y
132134 CONFIG_USB_GADGET=y
133135 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -10,6 +10,7 @@ CONFIG_SPL_TEXT_BASE=0x40300000
1010 CONFIG_OMAP54XX=y
1111 CONFIG_TARGET_DRA7XX_EVM=y
1212 CONFIG_SPL=y
13+CONFIG_SPL_MISC=y
1314 CONFIG_ENV_OFFSET_REDUND=0x280000
1415 CONFIG_SPL_SPI_FLASH_SUPPORT=y
1516 CONFIG_SPL_SPI=y
@@ -147,6 +148,7 @@ CONFIG_USB_XHCI_OMAP=y
147148 CONFIG_USB_DWC3=y
148149 CONFIG_USB_DWC3_OMAP=y
149150 CONFIG_USB_DWC3_GENERIC=y
151+CONFIG_SPL_USB_DWC3_GENERIC=y
150152 CONFIG_USB_DWC3_PHY_OMAP=y
151153 CONFIG_USB_GADGET=y
152154 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -13,6 +13,7 @@ CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
1313 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
1414 CONFIG_TARGET_DRA7XX_EVM=y
1515 CONFIG_SPL=y
16+CONFIG_SPL_MISC=y
1617 CONFIG_ENV_OFFSET_REDUND=0x280000
1718 CONFIG_SPL_SPI_FLASH_SUPPORT=y
1819 CONFIG_SPL_SPI=y
@@ -141,6 +142,7 @@ CONFIG_USB_XHCI_OMAP=y
141142 CONFIG_USB_DWC3=y
142143 CONFIG_USB_DWC3_OMAP=y
143144 CONFIG_USB_DWC3_GENERIC=y
145+CONFIG_SPL_USB_DWC3_GENERIC=y
144146 CONFIG_USB_DWC3_PHY_OMAP=y
145147 CONFIG_USB_GADGET=y
146148 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
--- a/configs/dra7xx_hs_evm_usb_defconfig
+++ b/configs/dra7xx_hs_evm_usb_defconfig
@@ -15,6 +15,7 @@ CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000
1515 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000
1616 CONFIG_TARGET_DRA7XX_EVM=y
1717 CONFIG_SPL=y
18+CONFIG_SPL_MISC=y
1819 CONFIG_ENV_OFFSET_REDUND=0x280000
1920 CONFIG_SPL_SPI_FLASH_SUPPORT=y
2021 CONFIG_SPL_SPI=y
@@ -129,6 +130,7 @@ CONFIG_USB_XHCI_DWC3=y
129130 CONFIG_USB_XHCI_OMAP=y
130131 CONFIG_USB_DWC3=y
131132 CONFIG_USB_DWC3_GENERIC=y
133+CONFIG_SPL_USB_DWC3_GENERIC=y
132134 CONFIG_USB_GADGET=y
133135 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
134136 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -30,6 +30,13 @@ config USB_DWC3_GENERIC
3030 Select this for Xilinx ZynqMP and similar Platforms.
3131 This wrapper supports Host and Peripheral operation modes.
3232
33+config SPL_USB_DWC3_GENERIC
34+ bool "Generic implementation of a DWC3 wrapper (aka dwc3 glue) for the SPL"
35+ depends on SPL_DM_USB && USB_DWC3 && SPL_MISC
36+ help
37+ Select this for Xilinx ZynqMP and similar Platforms.
38+ This wrapper supports Host and Peripheral operation modes.
39+
3340 config USB_DWC3_MESON_G12A
3441 bool "Amlogic Meson G12A USB wrapper"
3542 depends on DM_USB && USB_DWC3 && ARCH_MESON
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_USB_DWC3_GADGET) += gadget.o ep0.o
99 obj-$(CONFIG_USB_DWC3_OMAP) += dwc3-omap.o
1010 obj-$(CONFIG_USB_DWC3_MESON_G12A) += dwc3-meson-g12a.o
1111 obj-$(CONFIG_USB_DWC3_MESON_GXL) += dwc3-meson-gxl.o
12-obj-$(CONFIG_USB_DWC3_GENERIC) += dwc3-generic.o
12+obj-$(CONFIG_$(SPL_)USB_DWC3_GENERIC) += dwc3-generic.o
1313 obj-$(CONFIG_USB_DWC3_UNIPHIER) += dwc3-uniphier.o
1414 obj-$(CONFIG_USB_DWC3_LAYERSCAPE) += dwc3-layerscape.o
1515 obj-$(CONFIG_USB_DWC3_PHY_OMAP) += ti_usb_phy.o
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -241,12 +241,6 @@ static int sunxi_musb_enable(struct musb *musb)
241241 musb_writeb(musb->mregs, USBC_REG_o_VEND0, 0);
242242
243243 if (is_host_enabled(musb)) {
244- ret = sun4i_usb_phy_vbus_detect(&glue->phy);
245- if (ret == 1) {
246- printf("A charger is plugged into the OTG: ");
247- return -ENODEV;
248- }
249-
250244 ret = sun4i_usb_phy_id_detect(&glue->phy);
251245 if (ret == 1) {
252246 printf("No host cable detected: ");