Skip to contentSkip to conversation

Revert "sunxi: imply USB_GADGET"

PATCH New Icenowy Zheng 2 participants 2 messages Sep 29, 2017 Arm (32-bit)

lore
Share & tools
lore

Icenowy Zheng

author
#0 lore raw

PATCH 1/1 Revert "sunxi: imply USB_GADGET"

This reverts commit 061221ae61440eb05fd5b94ca77c7731315cbddd.

The implying of USB_GADGET makes the boards without USB_MUSB_GADGET enabled not able to be built in the U-Boot, and the number of the boards broken is much more than the boards benefited from this commit. So it's reverted.

Signed-off-by Icenowy Zheng <[email protected]>
---
 arch/arm/Kconfig                               | 1 -
 configs/A13-OLinuXino_defconfig                | 2 ++
 configs/A20-OLinuXino-Lime2-eMMC_defconfig     | 2 ++
 configs/A20-OLinuXino-Lime2_defconfig          | 2 ++
 configs/CHIP_defconfig                         | 2 ++
 configs/CHIP_pro_defconfig                     | 2 ++
 configs/Cubietruck_defconfig                   | 2 ++
 configs/Nintendo_NES_Classic_Edition_defconfig | 2 ++
 configs/Sinlinx_SinA33_defconfig               | 2 ++
 configs/parrot_r16_defconfig                   | 2 ++
 10 files changed, 18 insertions(+), 1 deletion(-)
arch/arm/Kconfig +0 -1
index 28b30ce0c3..e78a43a519 100644
@@ -704,7 +704,6 @@ config ARCH_SUNXI
 	imply SPL_MMC_SUPPORT if MMC
 	imply SPL_POWER_SUPPORT
 	imply SPL_SERIAL_SUPPORT
-	imply USB_GADGET
 
 config TARGET_TS4600
 	bool "Support TS4600"
configs/A13-OLinuXino_defconfig +2 -0
index ed8349000e..ae790164df 100644
@@ -31,3 +31,5 @@ CONFIG_AXP_ALDO3_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
configs/A20-OLinuXino-Lime2-eMMC_defconfig +2 -0
index b89c505efa..5df2c8b9d9 100644
@@ -32,3 +32,5 @@ CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
configs/A20-OLinuXino-Lime2_defconfig +2 -0
index f9388a005b..ebb435f309 100644
@@ -32,3 +32,5 @@ CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
configs/CHIP_defconfig +2 -0
index 5acce42a60..7d50d0533d 100644
@@ -22,4 +22,6 @@ CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT_OVERLAY=y
configs/CHIP_pro_defconfig +2 -0
index 2303135449..76daf477ec 100644
@@ -27,4 +27,6 @@ CONFIG_AXP_ALDO4_VOLT=3300
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_OF_LIBFDT_OVERLAY=y
configs/Cubietruck_defconfig +2 -0
index 3dff02f342..1b2989d364 100644
@@ -32,3 +32,5 @@ CONFIG_SCSI=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
configs/Nintendo_NES_Classic_Edition_defconfig +2 -0
index 26fcffa02f..5986764a14 100644
@@ -22,3 +22,5 @@ CONFIG_AXP_DLDO1_VOLT=3300
 CONFIG_AXP_ELDO2_VOLT=1800
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
configs/Sinlinx_SinA33_defconfig +2 -0
index 32c887210d..d1129636dd 100644
@@ -26,3 +26,5 @@ CONFIG_DFU_RAM=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
configs/parrot_r16_defconfig +2 -0
index d6bc89c29e..65be4a7fbf 100644
@@ -22,3 +22,5 @@ CONFIG_FASTBOOT_FLASH=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
Signature · 1 line
2.13.5
#1 lore raw

PATCH 1/1 Revert "sunxi: imply USB_GADGET"

Quoted 26 lines · Icenowy Zheng

This reverts commit 061221ae61440eb05fd5b94ca77c7731315cbddd.

The implying of USB_GADGET makes the boards without USB_MUSB_GADGET enabled not able to be built in the U-Boot, and the number of the boards broken is much more than the boards benefited from this commit. So it's reverted.

Signed-off-by Icenowy Zheng <[email protected]>
---
 arch/arm/Kconfig                               | 1 -
 configs/A13-OLinuXino_defconfig                | 2 ++
 configs/A20-OLinuXino-Lime2-eMMC_defconfig     | 2 ++
 configs/A20-OLinuXino-Lime2_defconfig          | 2 ++
 configs/CHIP_defconfig                         | 2 ++
 configs/CHIP_pro_defconfig                     | 2 ++
 configs/Cubietruck_defconfig                   | 2 ++
 configs/Nintendo_NES_Classic_Edition_defconfig | 2 ++
 configs/Sinlinx_SinA33_defconfig               | 2 ++
 configs/parrot_r16_defconfig                   | 2 ++
 10 files changed, 18 insertions(+), 1 deletion(-)
arch/arm/Kconfig +0 -0
index 28b30ce0c3..e78a43a519 100644

arch/arm/Kconfig config ARCH_SUNXI · line 707

Quoted 4 lines
arch/arm/Kconfig +0 -1
@@ -704,7 +704,6 @@ config ARCH_SUNXI
 	imply SPL_MMC_SUPPORT if MMC
 	imply SPL_POWER_SUPPORT
 	imply SPL_SERIAL_SUPPORT
-	imply USB_GADGET

This doesn't fix anything though. You still have the option to enable that option in the offended boards, and it will be just as broken.

What is the breakage you have, on what boards?

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170929/395dd03e/attachment.sig>