| Message ID | 20170929114448.1519-1-icenowy@aosc.io |
|---|---|
| State | Changes Requested |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | [U-Boot] Revert "sunxi: imply USB_GADGET" | expand |
On Fri, Sep 29, 2017 at 11:44:48AM +0000, Icenowy Zheng wrote: > 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 <icenowy@aosc.io> > --- > 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(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 28b30ce0c3..e78a43a519 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -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
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 28b30ce0c3..e78a43a519 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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" diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index ed8349000e..ae790164df 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -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 diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig index b89c505efa..5df2c8b9d9 100644 --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig @@ -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 diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index f9388a005b..ebb435f309 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -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 diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig index 5acce42a60..7d50d0533d 100644 --- a/configs/CHIP_defconfig +++ b/configs/CHIP_defconfig @@ -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 diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig index 2303135449..76daf477ec 100644 --- a/configs/CHIP_pro_defconfig +++ b/configs/CHIP_pro_defconfig @@ -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 diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 3dff02f342..1b2989d364 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -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 diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig index 26fcffa02f..5986764a14 100644 --- a/configs/Nintendo_NES_Classic_Edition_defconfig +++ b/configs/Nintendo_NES_Classic_Edition_defconfig @@ -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 diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index 32c887210d..d1129636dd 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -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 diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig index d6bc89c29e..65be4a7fbf 100644 --- a/configs/parrot_r16_defconfig +++ b/configs/parrot_r16_defconfig @@ -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
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 <icenowy@aosc.io> --- 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(-)