From: Sam Protsenko <semen.protsenko@linaro.org> Date: Wed, 13 Apr 2016 11:20:26 +0000 (+0300) Subject: usb: gadget: Move CONFIG_USB_GADGET_DOWNLOAD to Kconfig X-Git-Tag: v2025.01-rc5-pxa1908~9566^2~4 X-Git-Url: http://git.dujemihanovic.xyz/img/%7B%7B?a=commitdiff_plain;h=aaa4a9e313ee6e5d30c1476ad754e0b907e34217;p=u-boot.git usb: gadget: Move CONFIG_USB_GADGET_DOWNLOAD to Kconfig While at it, remove obsolete CONFIG_USBDOWNLOAD_GADGET option from some config headers. This is also probably fixes am335x_baltos board. Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org> --- diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 37ce92329b..e46efc6e76 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -22,3 +22,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2" CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig index 13a8f327bc..4fc1a31dc5 100644 --- a/configs/CHIP_defconfig +++ b/configs/CHIP_defconfig @@ -13,3 +13,4 @@ CONFIG_AXP_ALDO3_VOLT=3300 CONFIG_AXP_ALDO4_VOLT=3300 CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 8c4fcf329e..2ec2928d71 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -19,3 +19,4 @@ CONFIG_ETH_DESIGNWARE=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 3562e5860b..c0c7468826 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 46ac47181a..8f781c833a 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -20,4 +20,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index 8208b3cb95..8e252fff9a 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -27,3 +27,4 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index b59ff810de..426ddc5d9f 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -19,4 +19,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 9458fd1c9e..264fe367ea 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index 5a84150ebc..222fe82fb5 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -12,4 +12,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index c9e0761bf1..917128b784 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index e8b2b913e6..81b3d27650 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig index f888211b12..a06f7225ac 100644 --- a/configs/am335x_gp_evm_defconfig +++ b/configs/am335x_gp_evm_defconfig @@ -21,4 +21,5 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_RSA=y diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig index e628bd4074..b02f8ad396 100644 --- a/configs/am437x_gp_evm_defconfig +++ b/configs/am437x_gp_evm_defconfig @@ -23,3 +23,4 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig index d556a7fe95..1960429f75 100644 --- a/configs/am437x_sk_evm_defconfig +++ b/configs/am437x_sk_evm_defconfig @@ -27,3 +27,4 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index 9b746bfe1e..942a6a0eb0 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -14,4 +14,5 @@ CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 30a344cbd9..114d10f9b4 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -13,4 +13,5 @@ CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index 75c75dc783..52265c340b 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -12,4 +12,5 @@ CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 9c2234f956..9166848863 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -13,4 +13,5 @@ CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig index a8b4621f91..882a21e8d9 100644 --- a/configs/apalis_t30_defconfig +++ b/configs/apalis_t30_defconfig @@ -19,4 +19,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index 11d20c0014..74a2881f80 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -11,3 +11,4 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index b7336b4ba1..9c66669200 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -11,3 +11,4 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 15d3b8f3be..50a6a30d59 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -10,3 +10,4 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/bcm28155_w1d_defconfig b/configs/bcm28155_w1d_defconfig index d06130ce2b..cd6a1904c9 100644 --- a/configs/bcm28155_w1d_defconfig +++ b/configs/bcm28155_w1d_defconfig @@ -11,3 +11,4 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 1ab24bd277..04ecab9e8c 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -23,4 +23,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 807c945f95..d9a58ada9a 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -14,4 +14,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index f923cfd835..e605ac63bb 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -14,4 +14,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig index c7347257ea..d21e3e91eb 100644 --- a/configs/cgtqmx6eval_defconfig +++ b/configs/cgtqmx6eval_defconfig @@ -11,4 +11,5 @@ CONFIG_CMD_GPIO=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig index 6f93f1cd2f..30d8b2bfa1 100644 --- a/configs/colibri_t20_defconfig +++ b/configs/colibri_t20_defconfig @@ -22,6 +22,7 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_VIDEO_TEGRA20=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 74f90db83e..81258a7d4b 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -17,4 +17,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index ccba59bad6..ba6ee38c4b 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -20,3 +20,4 @@ CONFIG_FSL_DSPI=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index 9f38c37d4e..534a31b67f 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -13,4 +13,5 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index 5b54e75ef8..ccfc6ba3ce 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -21,4 +21,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/dra72_evm_defconfig b/configs/dra72_evm_defconfig index 47fb0d7160..b2276a90c0 100644 --- a/configs/dra72_evm_defconfig +++ b/configs/dra72_evm_defconfig @@ -26,3 +26,4 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/dra74_evm_defconfig b/configs/dra74_evm_defconfig index a15b65b3e3..7aa823334e 100644 --- a/configs/dra74_evm_defconfig +++ b/configs/dra74_evm_defconfig @@ -25,3 +25,4 @@ CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 2d504a59b9..160ce933a5 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -16,4 +16,5 @@ CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/dra7xx_evm_qspiboot_defconfig b/configs/dra7xx_evm_qspiboot_defconfig index 6af9619942..4b4fd272c9 100644 --- a/configs/dra7xx_evm_qspiboot_defconfig +++ b/configs/dra7xx_evm_qspiboot_defconfig @@ -16,4 +16,5 @@ CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/dra7xx_evm_uart3_defconfig b/configs/dra7xx_evm_uart3_defconfig index 80ae9dd007..c86cedc37b 100644 --- a/configs/dra7xx_evm_uart3_defconfig +++ b/configs/dra7xx_evm_uart3_defconfig @@ -17,4 +17,5 @@ CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/draco_defconfig b/configs/draco_defconfig index be3ec0a525..48ae025750 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/e2220-1170_defconfig b/configs/e2220-1170_defconfig index e0790aba45..845e6d3c74 100644 --- a/configs/e2220-1170_defconfig +++ b/configs/e2220-1170_defconfig @@ -19,3 +19,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 5228c845b5..0afc696408 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -19,4 +19,5 @@ CONFIG_E1000=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 3078386448..eefe971202 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -23,4 +23,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index 06698b8b65..351da874d4 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -13,4 +13,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 27ace9086d..350ca682ca 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index d085ef78b1..4f467531af 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx6qpsabreauto_defconfig b/configs/mx6qpsabreauto_defconfig index 4273a3283a..47843f160a 100644 --- a/configs/mx6qpsabreauto_defconfig +++ b/configs/mx6qpsabreauto_defconfig @@ -8,4 +8,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index 60262cd3c3..f719673e08 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 917362af13..d6f76cc43a 100644 --- a/configs/mx6qsabrelite_defconfig +++ b/configs/mx6qsabrelite_defconfig @@ -12,4 +12,5 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 333eb6721f..6d6afd847d 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index 2e0363fef6..078a362147 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -11,4 +11,5 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index d106d8985e..4e4252db73 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -15,4 +15,5 @@ CONFIG_CMD_PING=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index 7ba591a30b..338911a6f8 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 3b46fb6e43..0c38e9214e 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index 6049891c93..710fdef82c 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index ce5b61fd00..0563ff3db6 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 2e264f29eb..56c4b152f2 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 39b381f8e2..0229eaa1d9 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -10,4 +10,5 @@ CONFIG_SPI_FLASH_SST=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig index dc965cc1bb..8ce1c2f4ab 100644 --- a/configs/nyan-big_defconfig +++ b/configs/nyan-big_defconfig @@ -36,6 +36,7 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_DM_VIDEO=y CONFIG_DISPLAY=y CONFIG_VIDEO_TEGRA124=y diff --git a/configs/odroid-xu3_defconfig b/configs/odroid-xu3_defconfig index 4548cf0496..da92b2d165 100644 --- a/configs/odroid-xu3_defconfig +++ b/configs/odroid-xu3_defconfig @@ -21,5 +21,6 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_VIDEO_BRIDGE=y CONFIG_ERRNO_STR=y diff --git a/configs/odroid_defconfig b/configs/odroid_defconfig index dbdbf96666..2aea8c6db7 100644 --- a/configs/odroid_defconfig +++ b/configs/odroid_defconfig @@ -25,4 +25,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_ERRNO_STR=y diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index ab3cac448c..fdce13c88b 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -10,4 +10,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index fefe209e97..ccb968622d 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -14,4 +14,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig index 3fc75df353..024de72230 100644 --- a/configs/omap5_uevm_defconfig +++ b/configs/omap5_uevm_defconfig @@ -10,4 +10,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 2ce71d46bc..17141fdb29 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -15,3 +15,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/p2371-0000_defconfig b/configs/p2371-0000_defconfig index 4cff742136..d258c7c53d 100644 --- a/configs/p2371-0000_defconfig +++ b/configs/p2371-0000_defconfig @@ -20,3 +20,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/p2371-2180_defconfig b/configs/p2371-2180_defconfig index cd0d325f9a..26765d6f75 100644 --- a/configs/p2371-2180_defconfig +++ b/configs/p2371-2180_defconfig @@ -22,3 +22,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/p2571_defconfig b/configs/p2571_defconfig index 65d788a625..68abec1825 100644 --- a/configs/p2571_defconfig +++ b/configs/p2571_defconfig @@ -20,3 +20,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 13e27b5453..f27478413b 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -16,4 +16,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 6f92d841a0..508ee47dc7 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/rut_defconfig b/configs/rut_defconfig index d9367b3c1a..0363980b83 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -16,4 +16,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 89c11953bd..47cf3af8d4 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -14,3 +14,4 @@ CONFIG_SYS_PROMPT="Goni # " CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index dfcf4b7262..9927012654 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -14,3 +14,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 84ba329d02..6d254798b9 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -10,4 +10,5 @@ CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\ CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b" CONFIG_USB=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index 313c48901b..6816d5a465 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -13,4 +13,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig index 372b312b4f..fbf72660ac 100644 --- a/configs/socfpga_arria5_defconfig +++ b/configs/socfpga_arria5_defconfig @@ -29,3 +29,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/socfpga_cyclone5_defconfig b/configs/socfpga_cyclone5_defconfig index b4de001554..da323db5b0 100644 --- a/configs/socfpga_cyclone5_defconfig +++ b/configs/socfpga_cyclone5_defconfig @@ -29,3 +29,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig index a03d161405..c5efba5b4e 100644 --- a/configs/socfpga_de0_nano_soc_defconfig +++ b/configs/socfpga_de0_nano_soc_defconfig @@ -24,3 +24,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig index d5d5a5c007..f1ae006a29 100644 --- a/configs/socfpga_mcvevk_defconfig +++ b/configs/socfpga_mcvevk_defconfig @@ -24,3 +24,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/socfpga_sockit_defconfig b/configs/socfpga_sockit_defconfig index 52d1d18861..730d9fc631 100644 --- a/configs/socfpga_sockit_defconfig +++ b/configs/socfpga_sockit_defconfig @@ -29,3 +29,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/socfpga_socrates_defconfig b/configs/socfpga_socrates_defconfig index 902b4d2a48..1cf2ce0c5c 100644 --- a/configs/socfpga_socrates_defconfig +++ b/configs/socfpga_socrates_defconfig @@ -28,3 +28,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 8a6b337726..8cdbb89720 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -15,5 +15,6 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_USB=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_TINY_PRINTF=y CONFIG_OF_LIBFDT=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index dc8be7665e..5dca48fd74 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -11,4 +11,5 @@ CONFIG_DM_THERMAL=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 95d516f23d..0fd57e6a53 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -15,4 +15,5 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 60fbab973c..d7f8405081 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -17,3 +17,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 079233abec..b5431e5722 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -16,3 +16,4 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 49ff5330c9..0d20697b65 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -21,4 +21,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index c7d185cbdb..c51516c3d8 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -11,4 +11,5 @@ CONFIG_CMD_GPIO=y CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT=y diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index 86d65dc8f1..81f59457e6 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -40,4 +40,5 @@ CONFIG_ZYNQ_GEM=y CONFIG_USB=y CONFIG_USB_DWC3=y CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y # CONFIG_REGEX is not set diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig index 28fbd26cd7..3bd6fca900 100644 --- a/configs/zynq_picozed_defconfig +++ b/configs/zynq_picozed_defconfig @@ -17,3 +17,4 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index e561784360..81d211f942 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -29,3 +29,4 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index d3a0f23628..75d510170e 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -26,3 +26,4 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 63512dd500..51b2788ce1 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -26,3 +26,4 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index e397acbd5f..01ca5d210a 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -28,3 +28,4 @@ CONFIG_USB_ULPI_VIEWPORT=y CONFIG_USB_ULPI=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 5838d6e8de..969873c928 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -80,4 +80,10 @@ config USB_GADGET_VBUS_DRAW config USB_GADGET_DUALSPEED bool +config USB_GADGET_DOWNLOAD + bool "Enable USB download gadget" + help + Composite USB download gadget support (g_dnl) for download functions. + This code works on top of composite gadget. + endif # USB_GADGET diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index f0e13b81b5..cd78a0644f 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -287,7 +287,6 @@ #define CONFIG_ARCH_MISC_INIT #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 8bea4c26b7..3643489b18 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -125,6 +125,7 @@ #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT) #undef CONFIG_USB_DWC3 +#undef CONFIG_USB_GADGET_DOWNLOAD #undef CONFIG_USB_GADGET_VBUS_DRAW #undef CONFIG_USB_GADGET_DUALSPEED #endif @@ -135,7 +136,6 @@ #define CONFIG_USB_DWC3_OMAP #define CONFIG_USB_DWC3_GADGET -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_VENDOR_NUM 0x0403 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 8280e6034a..96a17dd141 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -273,7 +273,6 @@ #define CONFIG_ARCH_MISC_INIT #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT -#define CONFIG_USBDOWNLOAD_GADGET #define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_HOST diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index c223931355..b466d48e68 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -438,7 +438,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_ARCH_MISC_INIT #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index b431781ac1..680ef1652f 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -139,7 +139,6 @@ #define CONFIG_FASTBOOT_BUF_SIZE (CONFIG_SYS_SDRAM_SIZE - SZ_1M) #define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_SDRAM_BASE #define CONFIG_USB_GADGET_BCM_UDC_OTG_PHY -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USBID_ADDR 0x34052c46 #define CONFIG_G_DNL_VENDOR_NUM 0x18d1 /* google */ #define CONFIG_G_DNL_PRODUCT_NUM 0x0d02 /* nexus one */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index db207b9e2d..403de8403a 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -90,7 +90,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 3652d6101b..74a3874ead 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -243,7 +243,6 @@ #define CONFIG_G_DNL_PRODUCT_NUM CONFIG_TRDX_PID_COLIBRI_VF50 /* USB DFU */ -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_CMD_DFU #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_NAND diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 81ebda4fe2..0b28529b4a 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -121,7 +121,6 @@ #define CONFIG_CMD_DFU #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_NAND -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_SYS_DFU_DATA_BUF_SIZE (SZ_1M) #define DFU_MANIFEST_POLL_TIMEOUT 25000 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index a230896396..70c25bf0e0 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -231,7 +231,6 @@ #define CONFIG_USB_DWC3_OMAP #define CONFIG_USB_DWC3_GADGET -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022 diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 7973991af6..a0f4aa8790 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -27,9 +27,6 @@ #define CONFIG_CMD_DFU #define CONFIG_CMD_GPT -/* USB Composite download gadget - g_dnl */ -#define CONFIG_USB_GADGET_DOWNLOAD - /* TIZEN THOR downloader support */ #define CONFIG_CMD_THOR_DOWNLOAD #define CONFIG_USB_FUNCTION_THOR diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 711777c28c..0921093056 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -193,7 +193,6 @@ /* USB Mass Storage Gadget */ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_USB_GADGET_DOWNLOAD /* Netchip IDs */ #define CONFIG_G_DNL_VENDOR_NUM 0x0525 diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 6a487f29f3..ab4cbabd3d 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -188,8 +188,6 @@ * Download */ -#define CONFIG_USB_GADGET_DOWNLOAD - #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 249554c338..8d8612d7df 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -238,7 +238,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index fb47a6c203..f62e1d4024 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -261,7 +261,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 38e38cade4..f906bf241b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -330,7 +330,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_USB_GADGET_DOWNLOAD /* Netchip IDs */ #define CONFIG_G_DNL_VENDOR_NUM 0x0525 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index e704bb49c3..7e91f61eee 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -55,7 +55,6 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x04E8 #define CONFIG_G_DNL_PRODUCT_NUM 0x6601 #define CONFIG_G_DNL_MANUFACTURER "Samsung" -#define CONFIG_USB_GADGET_DOWNLOAD /* DFU */ #define CONFIG_USB_FUNCTION_DFU diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 276429e5c6..aec835276b 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -64,7 +64,6 @@ #define CONFIG_TWL4030_USB 1 #define CONFIG_USB_ETHER #define CONFIG_USB_ETHER_RNDIS -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022 #define CONFIG_G_DNL_MANUFACTURER "TI" diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index b083d57dde..9337b890f7 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -83,7 +83,6 @@ #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_ETHER #define CONFIG_USB_ETHER_RNDIS -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022 #define CONFIG_G_DNL_MANUFACTURER "TI" diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 85e46b45c5..8a98934020 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -104,7 +104,6 @@ #define CONFIG_USB_DWC3_OMAP #define CONFIG_USB_DWC3_GADGET -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_VENDOR_NUM 0x0403 #define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index e22818e0e0..d101cf20f4 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -70,7 +70,6 @@ #define CONFIG_CMD_GPT /* USB Composite download gadget - g_dnl */ -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 3dbe3439d2..d630f043d4 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -241,8 +241,6 @@ #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #endif /* CONFIG_USB_MUSB_GADGET */ -#define CONFIG_USB_GADGET_DOWNLOAD - /* USB DRACO ID as default */ #define CONFIG_USBD_HS #define CONFIG_G_DNL_VENDOR_NUM 0x0908 diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 0586aec791..bafa8e3d3a 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -175,7 +175,6 @@ #define CONFIG_CMD_DFU #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_NAND -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_1M #define DFU_MANIFEST_POLL_TIMEOUT 25000 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 6c8b00ebbd..e61b115430 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -205,8 +205,6 @@ * Download */ -#define CONFIG_USB_GADGET_DOWNLOAD - #define CONFIG_G_DNL_VENDOR_NUM 0x0451 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 8494486f30..2da40f3320 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -250,8 +250,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); * USB Gadget (DFU, UMS) */ #if defined(CONFIG_CMD_DFU) || defined(CONFIG_CMD_USB_MASS_STORAGE) -/* USB Composite download gadget - g_dnl */ -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_USB_FUNCTION_DFU diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 805ae09d40..6e880a7e03 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -342,17 +342,12 @@ extern int soft_i2c_gpio_scl; #endif #ifdef CONFIG_USB_MUSB_GADGET - -#define CONFIG_USB_GADGET_DOWNLOAD -#define CONFIG_USB_FUNCTION_DFU -#define CONFIG_USB_FUNCTION_FASTBOOT -#define CONFIG_USB_FUNCTION_MASS_STORAGE -#endif - -#ifdef CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_VENDOR_NUM 0x1f3a #define CONFIG_G_DNL_PRODUCT_NUM 0x1010 #define CONFIG_G_DNL_MANUFACTURER "Allwinner Technology" +#define CONFIG_USB_FUNCTION_DFU +#define CONFIG_USB_FUNCTION_FASTBOOT +#define CONFIG_USB_FUNCTION_MASS_STORAGE #endif #ifdef CONFIG_USB_FUNCTION_DFU diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 0b04b3a697..422b7a1722 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -139,7 +139,6 @@ #define CONFIG_CMD_DFU #define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_NAND -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_SYS_DFU_DATA_BUF_SIZE (SZ_1M) #define DFU_MANIFEST_POLL_TIMEOUT 25000 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 110c49445d..19f35bb600 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -130,7 +130,6 @@ #ifdef CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USBD_HS #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 #define CONFIG_G_DNL_MANUFACTURER "TBS" diff --git a/include/configs/tegra-common-usb-gadget.h b/include/configs/tegra-common-usb-gadget.h index 45db9f1d20..6b1247c5e0 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -20,7 +20,6 @@ #ifndef CONFIG_G_DNL_MANUFACTURER #define CONFIG_G_DNL_MANUFACTURER "NVIDIA" #endif -#define CONFIG_USB_GADGET_DOWNLOAD /* USB mass storage protocol */ #define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE diff --git a/include/configs/warp.h b/include/configs/warp.h index 4e3e2026c5..11ebbeb79a 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -78,7 +78,6 @@ #define CONFIG_CMD_USB_MASS_STORAGE #define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_G_DNL_VENDOR_NUM 0x0525 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5 diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index c09b74631f..d572b814cb 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -124,8 +124,6 @@ #define CONFIG_USB_DWC3_GADGET -#define CONFIG_USB_GADGET_DOWNLOAD -#define CONFIG_USBDOWNLOAD_GADGET #define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x1800000 #define DFU_DEFAULT_POLL_TIMEOUT 300 #define CONFIG_USB_FUNCTION_DFU diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 513b527643..450d487b5b 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -98,7 +98,6 @@ # define CONFIG_EHCI_IS_TDI # define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -# define CONFIG_USB_GADGET_DOWNLOAD # define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000 # define DFU_DEFAULT_POLL_TIMEOUT 300 # define CONFIG_USB_FUNCTION_DFU