| Message ID | 1431798665-28790-1-git-send-email-contact@paulk.fr |
|---|---|
| State | Superseded |
| Delegated to: | Łukasz Majewski |
| Headers | show |
Hi Paul, > This introduces a coherent scheme for naming USB download gadget and > functions config options. The download USB gadget config option is > moved to CONFIG_USB_GADGET_DOWNLOAD for better consistency with other > gadgets and each function's config option is moved to a > CONFIG_USB_FUNCTION_ prefix. > > Signed-off-by: Paul Kocialkowski <contact@paulk.fr> > --- > README | 2 +- > board/samsung/common/Makefile | 2 +- > board/siemens/common/factoryset.c | 4 ++-- > doc/README.android-fastboot | 2 +- > drivers/dfu/Makefile | 2 +- > drivers/usb/gadget/Makefile | 8 ++++---- > include/configs/am335x_evm.h | 4 ++-- > include/configs/am43xx_evm.h | 4 ++-- > include/configs/bav335x.h | 6 +++--- > include/configs/colibri_vf.h | 6 +++--- > include/configs/dra7xx_evm.h | 4 ++-- > include/configs/exynos4-common.h | 8 ++++---- > include/configs/gw_ventana.h | 4 ++-- > include/configs/mx6sabre_common.h | 4 ++-- > include/configs/nitrogen6x.h | 4 ++-- > include/configs/omap3_beagle.h | 2 +- > include/configs/s5p_goni.h | 8 ++++---- > include/configs/siemens-am33x-common.h | 4 ++-- > include/configs/socfpga_common.h | 6 +++--- > include/configs/tbs2910.h | 4 ++-- > include/configs/tegra-common-usb-gadget.h | 6 +++--- > include/configs/warp.h | 6 +++--- > include/configs/zynq-common.h | 6 +++--- > 23 files changed, 53 insertions(+), 53 deletions(-) > > diff --git a/README b/README > index 1ea397a..ba3fa49 100644 > --- a/README > +++ b/README > @@ -1672,7 +1672,7 @@ The following options need to be configured: > key for the Replay Protection Memory Block partition > in eMMC. > - USB Device Firmware Update (DFU) class support: > - CONFIG_DFU_FUNCTION > + CONFIG_USB_FUNCTION_DFU > This enables the USB portion of the DFU USB class > > CONFIG_CMD_DFU > diff --git a/board/samsung/common/Makefile > b/board/samsung/common/Makefile index 93347ef..5fb01ce 100644 > --- a/board/samsung/common/Makefile > +++ b/board/samsung/common/Makefile > @@ -6,7 +6,7 @@ > # > > obj-$(CONFIG_SOFT_I2C_MULTI_BUS) += multi_i2c.o > -obj-$(CONFIG_USBDOWNLOAD_GADGET) += gadget.o > +obj-$(CONFIG_USB_GADGET_DOWNLOAD) += gadget.o > obj-$(CONFIG_MISC_COMMON) += misc.o > > ifndef CONFIG_SPL_BUILD > diff --git a/board/siemens/common/factoryset.c > b/board/siemens/common/factoryset.c index d81f548..6c869ed 100644 > --- a/board/siemens/common/factoryset.c > +++ b/board/siemens/common/factoryset.c > @@ -144,7 +144,7 @@ int factoryset_read_eeprom(int i2c_addr) > unsigned char eeprom_buf[0x3c00], hdr[4], > buf[MAX_STRING_LENGTH]; unsigned char *cp, *cp1; > > -#if defined(CONFIG_DFU_FUNCTION) > +#if defined(CONFIG_USB_FUNCTION_DFU) > factory_dat.usb_vendor_id = CONFIG_G_DNL_VENDOR_NUM; > factory_dat.usb_product_id = CONFIG_G_DNL_PRODUCT_NUM; > #endif > @@ -202,7 +202,7 @@ int factoryset_read_eeprom(int i2c_addr) > cp1 += 3; > } > > -#if defined(CONFIG_DFU_FUNCTION) > +#if defined(CONFIG_USB_FUNCTION_DFU) > /* read vid and pid for dfu mode */ > if (0 <= get_factory_record_val(cp, size, (uchar *)"USBD1", > (uchar *)"vid", buf, > diff --git a/doc/README.android-fastboot b/doc/README.android-fastboot > index 04411e9..c2a2418 100644 > --- a/doc/README.android-fastboot > +++ b/doc/README.android-fastboot > @@ -33,7 +33,7 @@ Board specific > The fastboot gadget relies on the USB download gadget, so the > following options must be configured: > > -CONFIG_USBDOWNLOAD_GADGET > +CONFIG_USB_GADGET_DOWNLOAD > CONFIG_G_DNL_VENDOR_NUM > CONFIG_G_DNL_PRODUCT_NUM > CONFIG_G_DNL_MANUFACTURER > diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile > index 5cc535e..cebea30 100644 > --- a/drivers/dfu/Makefile > +++ b/drivers/dfu/Makefile > @@ -5,7 +5,7 @@ > # SPDX-License-Identifier: GPL-2.0+ > # > > -obj-$(CONFIG_DFU_FUNCTION) += dfu.o > +obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o > obj-$(CONFIG_DFU_MMC) += dfu_mmc.o > obj-$(CONFIG_DFU_NAND) += dfu_nand.o > obj-$(CONFIG_DFU_RAM) += dfu_ram.o > diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile > index 70bb550..46d7d94 100644 > --- a/drivers/usb/gadget/Makefile > +++ b/drivers/usb/gadget/Makefile > @@ -15,10 +15,10 @@ obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += > s3c_udc_otg.o obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG_PHY) += > s3c_udc_otg_phy.o obj-$(CONFIG_USB_GADGET_FOTG210) += fotg210.o > obj-$(CONFIG_CI_UDC) += ci_udc.o > -obj-$(CONFIG_THOR_FUNCTION) += f_thor.o > -obj-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o > -obj-$(CONFIG_DFU_FUNCTION) += f_dfu.o > -obj-$(CONFIG_USB_GADGET_MASS_STORAGE) += f_mass_storage.o > +obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o > +obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o > +obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o > +obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o > obj-$(CONFIG_CMD_FASTBOOT) += f_fastboot.o > endif > ifdef CONFIG_USB_ETHER > diff --git a/include/configs/am335x_evm.h > b/include/configs/am335x_evm.h index 8da3325..b94e4b5 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -287,7 +287,7 @@ > #define CONFIG_MUSB_PIO_ONLY > #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT > #define CONFIG_USB_GADGET > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_GADGET_DOWNLOAD > #define CONFIG_USB_GADGET_DUALSPEED > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > #define CONFIG_MUSB_HOST > @@ -344,7 +344,7 @@ > > /* USB Device Firmware Update support */ > #ifndef CONFIG_SPL_BUILD > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_MMC > #define CONFIG_CMD_DFU > #define DFU_ALT_INFO_MMC \ > diff --git a/include/configs/am43xx_evm.h > b/include/configs/am43xx_evm.h index 331fdac..2e839b5 100644 > --- a/include/configs/am43xx_evm.h > +++ b/include/configs/am43xx_evm.h > @@ -118,7 +118,7 @@ > #define CONFIG_USB_DWC3_GADGET > > #define CONFIG_USB_GADGET > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_GADGET_DOWNLOAD > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" > #define CONFIG_G_DNL_VENDOR_NUM 0x0403 > @@ -128,7 +128,7 @@ > > #ifndef CONFIG_SPL_BUILD > /* USB Device Firmware Update support */ > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_RAM > #define CONFIG_CMD_DFU > > diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h > index 490c53e..7ce568b 100644 > --- a/include/configs/bav335x.h > +++ b/include/configs/bav335x.h > @@ -444,7 +444,7 @@ DEFAULT_LINUX_BOOT_ENV \ > #define CONFIG_MUSB_PIO_ONLY > #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT > #define CONFIG_USB_GADGET > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_GADGET_DOWNLOAD > #define CONFIG_USB_GADGET_DUALSPEED > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > #define CONFIG_MUSB_HOST > @@ -472,7 +472,7 @@ DEFAULT_LINUX_BOOT_ENV \ > > #ifdef CONFIG_MUSB_GADGET > #define CONFIG_CMD_USB_MASS_STORAGE > -#define CONFIG_USB_GADGET_MASS_STORAGE > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > > /* USB TI's IDs */ > #define CONFIG_G_DNL_VENDOR_NUM 0x0451 > @@ -494,7 +494,7 @@ DEFAULT_LINUX_BOOT_ENV \ > > /* USB Device Firmware Update support */ > #ifndef CONFIG_SPL_BUILD > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_MMC > #define CONFIG_CMD_DFU > #define DFU_ALT_INFO_MMC \ > diff --git a/include/configs/colibri_vf.h > b/include/configs/colibri_vf.h index 414600a..b4a9108 100644 > --- a/include/configs/colibri_vf.h > +++ b/include/configs/colibri_vf.h > @@ -256,16 +256,16 @@ > #define CONFIG_G_DNL_PRODUCT_NUM CONFIG_TRDX_PID_COLIBRI_VF50 > > /* USB DFU */ > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_GADGET_DOWNLOAD > #define CONFIG_CMD_DFU > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_NAND > #define CONFIG_DFU_MMC > #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024) > > /* USB Storage */ > #define CONFIG_USB_STORAGE > -#define CONFIG_USB_GADGET_MASS_STORAGE > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > #define CONFIG_CMD_USB_MASS_STORAGE > > #endif /* __CONFIG_H */ > diff --git a/include/configs/dra7xx_evm.h > b/include/configs/dra7xx_evm.h index d79612b..c5ce741 100644 > --- a/include/configs/dra7xx_evm.h > +++ b/include/configs/dra7xx_evm.h > @@ -187,7 +187,7 @@ > #define CONFIG_USB_DWC3_GADGET > > #define CONFIG_USB_GADGET > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_GADGET_DOWNLOAD > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" > #define CONFIG_G_DNL_VENDOR_NUM 0x0451 > @@ -195,7 +195,7 @@ > #define CONFIG_USB_GADGET_DUALSPEED > > /* USB Device Firmware Update support */ > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_RAM > #define CONFIG_CMD_DFU > > diff --git a/include/configs/exynos4-common.h > b/include/configs/exynos4-common.h index dbe05e4..6d1aad5 100644 > --- a/include/configs/exynos4-common.h > +++ b/include/configs/exynos4-common.h > @@ -34,13 +34,13 @@ > #define CONFIG_CMD_SETEXPR > > /* USB Composite download gadget - g_dnl */ > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_GADGET_DOWNLOAD > > /* TIZEN THOR downloader support */ > #define CONFIG_CMD_THOR_DOWNLOAD > -#define CONFIG_THOR_FUNCTION > +#define CONFIG_USB_FUNCTION_THOR > > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_MMC > #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M > #define DFU_DEFAULT_POLL_TIMEOUT 300 > @@ -63,7 +63,7 @@ > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > > #define CONFIG_CMD_USB_MASS_STORAGE > -#define CONFIG_USB_GADGET_MASS_STORAGE > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > > /* Common environment variables */ > #define CONFIG_EXTRA_ENV_ITB \ > diff --git a/include/configs/gw_ventana.h > b/include/configs/gw_ventana.h index b20b338..5d5c51e 100644 > --- a/include/configs/gw_ventana.h > +++ b/include/configs/gw_ventana.h > @@ -224,8 +224,8 @@ > /* USB Mass Storage Gadget */ > #define CONFIG_USB_GADGET > #define CONFIG_CMD_USB_MASS_STORAGE > -#define CONFIG_USB_GADGET_MASS_STORAGE > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > +#define CONFIG_USB_GADGET_DOWNLOAD > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > > /* Netchip IDs */ > diff --git a/include/configs/mx6sabre_common.h > b/include/configs/mx6sabre_common.h index b72522b..1240af7 100644 > --- a/include/configs/mx6sabre_common.h > +++ b/include/configs/mx6sabre_common.h > @@ -283,8 +283,8 @@ > > #define CONFIG_USB_GADGET > #define CONFIG_CMD_USB_MASS_STORAGE > -#define CONFIG_USB_GADGET_MASS_STORAGE > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > +#define CONFIG_USB_GADGET_DOWNLOAD > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > > #define CONFIG_G_DNL_VENDOR_NUM 0x0525 > diff --git a/include/configs/nitrogen6x.h > b/include/configs/nitrogen6x.h index eaa2c2c..53ee997 100644 > --- a/include/configs/nitrogen6x.h > +++ b/include/configs/nitrogen6x.h > @@ -407,8 +407,8 @@ > > #define CONFIG_USB_GADGET > #define CONFIG_CMD_USB_MASS_STORAGE > -#define CONFIG_USB_GADGET_MASS_STORAGE > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > +#define CONFIG_USB_GADGET_DOWNLOAD > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > > /* Netchip IDs */ > diff --git a/include/configs/omap3_beagle.h > b/include/configs/omap3_beagle.h index f25a940..1e7a158 100644 > --- a/include/configs/omap3_beagle.h > +++ b/include/configs/omap3_beagle.h > @@ -68,7 +68,7 @@ > #define CONFIG_USB_ETHER_RNDIS > #define CONFIG_USB_GADGET > #define CONFIG_USB_GADGET_VBUS_DRAW 0 > -#define CONFIG_USBDOWNLOAD_GADGET > +#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/s5p_goni.h b/include/configs/s5p_goni.h > index 8fadc68..6f4f9a0 100644 > --- a/include/configs/s5p_goni.h > +++ b/include/configs/s5p_goni.h > @@ -77,15 +77,15 @@ > #define CONFIG_CMD_GPT > > /* USB Composite download gadget - g_dnl */ > -#define CONFIG_USBDOWNLOAD_GADGET > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_GADGET_DOWNLOAD > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_MMC > #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M > #define DFU_DEFAULT_POLL_TIMEOUT 300 > > /* TIZEN THOR downloader support */ > #define CONFIG_CMD_THOR_DOWNLOAD > -#define CONFIG_THOR_FUNCTION > +#define CONFIG_USB_FUNCTION_THOR > > /* USB Samsung's IDs */ > #define CONFIG_G_DNL_VENDOR_NUM 0x04E8 > @@ -284,7 +284,7 @@ > #define CONFIG_USB_GADGET_DUALSPEED > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > #define CONFIG_CMD_USB_MASS_STORAGE > -#define CONFIG_USB_GADGET_MASS_STORAGE > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > > #define CONFIG_OF_LIBFDT > > diff --git a/include/configs/siemens-am33x-common.h > b/include/configs/siemens-am33x-common.h index c7affd6..09ba16d 100644 > --- a/include/configs/siemens-am33x-common.h > +++ b/include/configs/siemens-am33x-common.h > @@ -250,7 +250,7 @@ > #endif /* CONFIG_MUSB_GADGET */ > > #define CONFIG_USB_GADGET > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_GADGET_DOWNLOAD > > /* USB DRACO ID as default */ > #define CONFIG_USBD_HS > @@ -259,7 +259,7 @@ > #define CONFIG_G_DNL_MANUFACTURER "Siemens AG" > > /* USB Device Firmware Update support */ > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_NAND > #define CONFIG_CMD_DFU > #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20) > diff --git a/include/configs/socfpga_common.h > b/include/configs/socfpga_common.h index e742acf..374ca8a 100644 > --- a/include/configs/socfpga_common.h > +++ b/include/configs/socfpga_common.h > @@ -246,10 +246,10 @@ unsigned int > cm_get_qspi_controller_clk_hz(void); #define > CONFIG_USB_GADGET_VBUS_DRAW 2 > /* USB Composite download gadget - g_dnl */ > -#define CONFIG_USBDOWNLOAD_GADGET > -#define CONFIG_USB_GADGET_MASS_STORAGE > +#define CONFIG_USB_GADGET_DOWNLOAD > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_MMC > #define CONFIG_SYS_DFU_DATA_BUF_SIZE (32 * 1024 * 1024) > #define DFU_DEFAULT_POLL_TIMEOUT 300 > diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h > index b7ad7df..4b3294f 100644 > --- a/include/configs/tbs2910.h > +++ b/include/configs/tbs2910.h > @@ -170,10 +170,10 @@ > #define CONFIG_CI_UDC > #define CONFIG_USBD_HS > #define CONFIG_USB_GADGET > -#define CONFIG_USB_GADGET_MASS_STORAGE > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > #define CONFIG_USB_GADGET_DUALSPEED > #define CONFIG_USB_GADGET_VBUS_DRAW 0 > -#define CONFIG_USBDOWNLOAD_GADGET > +#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 287460c..d70a4e7 > 100644 --- a/include/configs/tegra-common-usb-gadget.h > +++ b/include/configs/tegra-common-usb-gadget.h > @@ -18,12 +18,12 @@ > #define CONFIG_G_DNL_VENDOR_NUM 0x0955 > #define CONFIG_G_DNL_PRODUCT_NUM 0x701A > #define CONFIG_G_DNL_MANUFACTURER "NVIDIA" > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_GADGET_DOWNLOAD > /* USB mass storage protocol */ > -#define CONFIG_USB_GADGET_MASS_STORAGE > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > #define CONFIG_CMD_USB_MASS_STORAGE > /* DFU protocol */ > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024) > #define CONFIG_CMD_DFU > #ifdef CONFIG_MMC > diff --git a/include/configs/warp.h b/include/configs/warp.h > index 2eb429e..5350a9a 100644 > --- a/include/configs/warp.h > +++ b/include/configs/warp.h > @@ -140,8 +140,8 @@ > > #define CONFIG_USB_GADGET > #define CONFIG_CMD_USB_MASS_STORAGE > -#define CONFIG_USB_GADGET_MASS_STORAGE > -#define CONFIG_USBDOWNLOAD_GADGET > +#define CONFIG_USB_FUNCTION_MASS_STORAGE > +#define CONFIG_USB_GADGET_DOWNLOAD > #define CONFIG_USB_GADGET_VBUS_DRAW 2 > > #define CONFIG_G_DNL_VENDOR_NUM 0x0525 > @@ -149,7 +149,7 @@ > #define CONFIG_G_DNL_MANUFACTURER "FSL" > > #define CONFIG_CMD_DFU > -#define CONFIG_DFU_FUNCTION > +#define CONFIG_USB_FUNCTION_DFU > #define CONFIG_DFU_MMC > #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M > #define DFU_DEFAULT_POLL_TIMEOUT 300 > diff --git a/include/configs/zynq-common.h > b/include/configs/zynq-common.h index 926b381..4b9fda5 100644 > --- a/include/configs/zynq-common.h > +++ b/include/configs/zynq-common.h > @@ -107,10 +107,10 @@ > # define CONFIG_CI_UDC /* ChipIdea CI13xxx UDC */ > # define CONFIG_USB_GADGET > # define CONFIG_USB_GADGET_DUALSPEED > -# define CONFIG_USBDOWNLOAD_GADGET > +# define CONFIG_USB_GADGET_DOWNLOAD > # define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000 > # define DFU_DEFAULT_POLL_TIMEOUT 300 > -# define CONFIG_DFU_FUNCTION > +# define CONFIG_USB_FUNCTION_DFU > # define CONFIG_DFU_RAM > # define CONFIG_USB_GADGET_VBUS_DRAW 2 > # define CONFIG_G_DNL_VENDOR_NUM 0x03FD > @@ -120,7 +120,7 @@ > # define CONFIG_USB_CABLE_CHECK > # define CONFIG_CMD_DFU > # define CONFIG_CMD_THOR_DOWNLOAD > -# define CONFIG_THOR_FUNCTION > +# define CONFIG_USB_FUNCTION_THOR > # define DFU_ALT_INFO_RAM \ > "dfu_ram_info=" \ > "set dfu_alt_info " \ Acked-by: Lukasz Majewski <l.majewski@samsung.com> I will test this patch on my devices and then pull it to u-boot-dfu tree.
Le lundi 18 mai 2015 à 15:01 +0200, Lukasz Majewski a écrit : > Hi Paul, > > > This introduces a coherent scheme for naming USB download gadget and > > functions config options. The download USB gadget config option is > > moved to CONFIG_USB_GADGET_DOWNLOAD for better consistency with other > > gadgets and each function's config option is moved to a > > CONFIG_USB_FUNCTION_ prefix. > > > > Signed-off-by: Paul Kocialkowski <contact@paulk.fr> > > --- [snip] > Acked-by: Lukasz Majewski <l.majewski@samsung.com> > > I will test this patch on my devices and then pull it to u-boot-dfu > tree. Is there anything holding back this patch set at this point?
Hi Paul, > Le lundi 18 mai 2015 à 15:01 +0200, Lukasz Majewski a écrit : > > Hi Paul, > > > > > This introduces a coherent scheme for naming USB download gadget > > > and functions config options. The download USB gadget config > > > option is moved to CONFIG_USB_GADGET_DOWNLOAD for better > > > consistency with other gadgets and each function's config option > > > is moved to a CONFIG_USB_FUNCTION_ prefix. > > > > > > Signed-off-by: Paul Kocialkowski <contact@paulk.fr> > > > --- > > [snip] > > > Acked-by: Lukasz Majewski <l.majewski@samsung.com> > > > > I will test this patch on my devices and then pull it to u-boot-dfu > > tree. > > Is there anything holding back this patch set at this point? > Sorry to say, but: ./tools/buildman/buildman.py --branch=HEAD samsung --detail --verbose --show_errors --force-build --count=4 --output-dir=./BUILD/ run on top of the newest u-boot-denx-usb/master SHA1: b2d0495b16e9e2fdaa1c04f5a43bf60f4ad3a5ea Caused build errors on the Odroix-XU3 board (attached to this e-mail).
Le vendredi 12 juin 2015 à 16:10 +0200, Lukasz Majewski a écrit : > Hi Paul, > > > Le lundi 18 mai 2015 à 15:01 +0200, Lukasz Majewski a écrit : > > > Hi Paul, > > > > > > > This introduces a coherent scheme for naming USB download gadget > > > > and functions config options. The download USB gadget config > > > > option is moved to CONFIG_USB_GADGET_DOWNLOAD for better > > > > consistency with other gadgets and each function's config option > > > > is moved to a CONFIG_USB_FUNCTION_ prefix. > > > > > > > > Signed-off-by: Paul Kocialkowski <contact@paulk.fr> > > > > --- > > > > [snip] > > > > > Acked-by: Lukasz Majewski <l.majewski@samsung.com> > > > > > > I will test this patch on my devices and then pull it to u-boot-dfu > > > tree. > > > > Is there anything holding back this patch set at this point? > > > > Sorry to say, but: > > ./tools/buildman/buildman.py --branch=HEAD samsung --detail --verbose > --show_errors --force-build --count=4 --output-dir=./BUILD/ > > run on top of the newest u-boot-denx-usb/master > > SHA1: b2d0495b16e9e2fdaa1c04f5a43bf60f4ad3a5ea > > Caused build errors on the Odroix-XU3 board (attached to this e-mail). Heh, I guess the patches were just too old. I just sent out v2 that includes the Odroid XU3. Thanks for pointing this out.
On Fri, 12 Jun 2015 19:59:22 +0200 Paul Kocialkowski <contact@paulk.fr> wrote: > Le vendredi 12 juin 2015 à 16:10 +0200, Lukasz Majewski a écrit : > > Hi Paul, > > > > > Le lundi 18 mai 2015 à 15:01 +0200, Lukasz Majewski a écrit : > > > > Hi Paul, > > > > > > > > > This introduces a coherent scheme for naming USB download > > > > > gadget and functions config options. The download USB gadget > > > > > config option is moved to CONFIG_USB_GADGET_DOWNLOAD for > > > > > better consistency with other gadgets and each function's > > > > > config option is moved to a CONFIG_USB_FUNCTION_ prefix. > > > > > > > > > > Signed-off-by: Paul Kocialkowski <contact@paulk.fr> > > > > > --- > > > > > > [snip] > > > > > > > Acked-by: Lukasz Majewski <l.majewski@samsung.com> > > > > > > > > I will test this patch on my devices and then pull it to > > > > u-boot-dfu tree. > > > > > > Is there anything holding back this patch set at this point? > > > > > > > Sorry to say, but: > > > > ./tools/buildman/buildman.py --branch=HEAD samsung --detail > > --verbose --show_errors --force-build --count=4 > > --output-dir=./BUILD/ > > > > run on top of the newest u-boot-denx-usb/master > > > > SHA1: b2d0495b16e9e2fdaa1c04f5a43bf60f4ad3a5ea > > > > Caused build errors on the Odroix-XU3 board (attached to this > > e-mail). > > Heh, I guess the patches were just too old. I just sent out v2 that > includes the Odroid XU3. Thanks :-). One more thing - in the future please add me to CC (as you didn't do that for v2). In u-boot you can use ./tools/patman tool to generate list of e-mail receivers. > > Thanks for pointing this out. > No problem :-). You were first "victim" of my automated building and testing setup :-). Best regards, Łukasz Majewski
Le vendredi 12 juin 2015 à 22:06 +0200, Lukasz Majewski a écrit : > On Fri, 12 Jun 2015 19:59:22 +0200 > Paul Kocialkowski <contact@paulk.fr> wrote: > > > Le vendredi 12 juin 2015 à 16:10 +0200, Lukasz Majewski a écrit : > > > Hi Paul, > > > > > > > Le lundi 18 mai 2015 à 15:01 +0200, Lukasz Majewski a écrit : > > > > > Hi Paul, > > > > > > > > > > > This introduces a coherent scheme for naming USB download > > > > > > gadget and functions config options. The download USB gadget > > > > > > config option is moved to CONFIG_USB_GADGET_DOWNLOAD for > > > > > > better consistency with other gadgets and each function's > > > > > > config option is moved to a CONFIG_USB_FUNCTION_ prefix. > > > > > > > > > > > > Signed-off-by: Paul Kocialkowski <contact@paulk.fr> > > > > > > --- > > > > > > > > [snip] > > > > > > > > > Acked-by: Lukasz Majewski <l.majewski@samsung.com> > > > > > > > > > > I will test this patch on my devices and then pull it to > > > > > u-boot-dfu tree. > > > > > > > > Is there anything holding back this patch set at this point? > > > > > > > > > > Sorry to say, but: > > > > > > ./tools/buildman/buildman.py --branch=HEAD samsung --detail > > > --verbose --show_errors --force-build --count=4 > > > --output-dir=./BUILD/ > > > > > > run on top of the newest u-boot-denx-usb/master > > > > > > SHA1: b2d0495b16e9e2fdaa1c04f5a43bf60f4ad3a5ea > > > > > > Caused build errors on the Odroix-XU3 board (attached to this > > > e-mail). > > > > Heh, I guess the patches were just too old. I just sent out v2 that > > includes the Odroid XU3. > > Thanks :-). > > One more thing - in the future please add me to CC (as you didn't do > that for v2). Well, I added: Lukasz Majewski <l.majewski@samsung.com> Is your correct address: Lukasz Majewski <l.majewski@majess.pl> now? > In u-boot you can use ./tools/patman tool to generate list of e-mail > receivers. Good to know :) > > Thanks for pointing this out. > > > > No problem :-). You were first "victim" of my automated building and > testing setup :-). Heh, good to see things like that in place.
diff --git a/README b/README index 1ea397a..ba3fa49 100644 --- a/README +++ b/README @@ -1672,7 +1672,7 @@ The following options need to be configured: key for the Replay Protection Memory Block partition in eMMC. - USB Device Firmware Update (DFU) class support: - CONFIG_DFU_FUNCTION + CONFIG_USB_FUNCTION_DFU This enables the USB portion of the DFU USB class CONFIG_CMD_DFU diff --git a/board/samsung/common/Makefile b/board/samsung/common/Makefile index 93347ef..5fb01ce 100644 --- a/board/samsung/common/Makefile +++ b/board/samsung/common/Makefile @@ -6,7 +6,7 @@ # obj-$(CONFIG_SOFT_I2C_MULTI_BUS) += multi_i2c.o -obj-$(CONFIG_USBDOWNLOAD_GADGET) += gadget.o +obj-$(CONFIG_USB_GADGET_DOWNLOAD) += gadget.o obj-$(CONFIG_MISC_COMMON) += misc.o ifndef CONFIG_SPL_BUILD diff --git a/board/siemens/common/factoryset.c b/board/siemens/common/factoryset.c index d81f548..6c869ed 100644 --- a/board/siemens/common/factoryset.c +++ b/board/siemens/common/factoryset.c @@ -144,7 +144,7 @@ int factoryset_read_eeprom(int i2c_addr) unsigned char eeprom_buf[0x3c00], hdr[4], buf[MAX_STRING_LENGTH]; unsigned char *cp, *cp1; -#if defined(CONFIG_DFU_FUNCTION) +#if defined(CONFIG_USB_FUNCTION_DFU) factory_dat.usb_vendor_id = CONFIG_G_DNL_VENDOR_NUM; factory_dat.usb_product_id = CONFIG_G_DNL_PRODUCT_NUM; #endif @@ -202,7 +202,7 @@ int factoryset_read_eeprom(int i2c_addr) cp1 += 3; } -#if defined(CONFIG_DFU_FUNCTION) +#if defined(CONFIG_USB_FUNCTION_DFU) /* read vid and pid for dfu mode */ if (0 <= get_factory_record_val(cp, size, (uchar *)"USBD1", (uchar *)"vid", buf, diff --git a/doc/README.android-fastboot b/doc/README.android-fastboot index 04411e9..c2a2418 100644 --- a/doc/README.android-fastboot +++ b/doc/README.android-fastboot @@ -33,7 +33,7 @@ Board specific The fastboot gadget relies on the USB download gadget, so the following options must be configured: -CONFIG_USBDOWNLOAD_GADGET +CONFIG_USB_GADGET_DOWNLOAD CONFIG_G_DNL_VENDOR_NUM CONFIG_G_DNL_PRODUCT_NUM CONFIG_G_DNL_MANUFACTURER diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile index 5cc535e..cebea30 100644 --- a/drivers/dfu/Makefile +++ b/drivers/dfu/Makefile @@ -5,7 +5,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_DFU_FUNCTION) += dfu.o +obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o obj-$(CONFIG_DFU_MMC) += dfu_mmc.o obj-$(CONFIG_DFU_NAND) += dfu_nand.o obj-$(CONFIG_DFU_RAM) += dfu_ram.o diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 70bb550..46d7d94 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -15,10 +15,10 @@ obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += s3c_udc_otg.o obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG_PHY) += s3c_udc_otg_phy.o obj-$(CONFIG_USB_GADGET_FOTG210) += fotg210.o obj-$(CONFIG_CI_UDC) += ci_udc.o -obj-$(CONFIG_THOR_FUNCTION) += f_thor.o -obj-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o -obj-$(CONFIG_DFU_FUNCTION) += f_dfu.o -obj-$(CONFIG_USB_GADGET_MASS_STORAGE) += f_mass_storage.o +obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o +obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o +obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o +obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o obj-$(CONFIG_CMD_FASTBOOT) += f_fastboot.o endif ifdef CONFIG_USB_ETHER diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 8da3325..b94e4b5 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -287,7 +287,7 @@ #define CONFIG_MUSB_PIO_ONLY #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_MUSB_HOST @@ -344,7 +344,7 @@ /* USB Device Firmware Update support */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC #define CONFIG_CMD_DFU #define DFU_ALT_INFO_MMC \ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 331fdac..2e839b5 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -118,7 +118,7 @@ #define CONFIG_USB_DWC3_GADGET #define CONFIG_USB_GADGET -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_VENDOR_NUM 0x0403 @@ -128,7 +128,7 @@ #ifndef CONFIG_SPL_BUILD /* USB Device Firmware Update support */ -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_RAM #define CONFIG_CMD_DFU diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 490c53e..7ce568b 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -444,7 +444,7 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_MUSB_PIO_ONLY #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_USB_GADGET -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_MUSB_HOST @@ -472,7 +472,7 @@ DEFAULT_LINUX_BOOT_ENV \ #ifdef CONFIG_MUSB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_USB_FUNCTION_MASS_STORAGE /* USB TI's IDs */ #define CONFIG_G_DNL_VENDOR_NUM 0x0451 @@ -494,7 +494,7 @@ DEFAULT_LINUX_BOOT_ENV \ /* USB Device Firmware Update support */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC #define CONFIG_CMD_DFU #define DFU_ALT_INFO_MMC \ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 414600a..b4a9108 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -256,16 +256,16 @@ #define CONFIG_G_DNL_PRODUCT_NUM CONFIG_TRDX_PID_COLIBRI_VF50 /* USB DFU */ -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_CMD_DFU -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_NAND #define CONFIG_DFU_MMC #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024) /* USB Storage */ #define CONFIG_USB_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE #endif /* __CONFIG_H */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index d79612b..c5ce741 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -187,7 +187,7 @@ #define CONFIG_USB_DWC3_GADGET #define CONFIG_USB_GADGET -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" #define CONFIG_G_DNL_VENDOR_NUM 0x0451 @@ -195,7 +195,7 @@ #define CONFIG_USB_GADGET_DUALSPEED /* USB Device Firmware Update support */ -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_RAM #define CONFIG_CMD_DFU diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index dbe05e4..6d1aad5 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -34,13 +34,13 @@ #define CONFIG_CMD_SETEXPR /* USB Composite download gadget - g_dnl */ -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DOWNLOAD /* TIZEN THOR downloader support */ #define CONFIG_CMD_THOR_DOWNLOAD -#define CONFIG_THOR_FUNCTION +#define CONFIG_USB_FUNCTION_THOR -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M #define DFU_DEFAULT_POLL_TIMEOUT 300 @@ -63,7 +63,7 @@ #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_USB_FUNCTION_MASS_STORAGE /* Common environment variables */ #define CONFIG_EXTRA_ENV_ITB \ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index b20b338..5d5c51e 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -224,8 +224,8 @@ /* USB Mass Storage Gadget */ #define CONFIG_USB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_FUNCTION_MASS_STORAGE +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_VBUS_DRAW 2 /* Netchip IDs */ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index b72522b..1240af7 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -283,8 +283,8 @@ #define CONFIG_USB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_FUNCTION_MASS_STORAGE +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_G_DNL_VENDOR_NUM 0x0525 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index eaa2c2c..53ee997 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -407,8 +407,8 @@ #define CONFIG_USB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_FUNCTION_MASS_STORAGE +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_VBUS_DRAW 2 /* Netchip IDs */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index f25a940..1e7a158 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -68,7 +68,7 @@ #define CONFIG_USB_ETHER_RNDIS #define CONFIG_USB_GADGET #define CONFIG_USB_GADGET_VBUS_DRAW 0 -#define CONFIG_USBDOWNLOAD_GADGET +#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/s5p_goni.h b/include/configs/s5p_goni.h index 8fadc68..6f4f9a0 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -77,15 +77,15 @@ #define CONFIG_CMD_GPT /* USB Composite download gadget - g_dnl */ -#define CONFIG_USBDOWNLOAD_GADGET -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_GADGET_DOWNLOAD +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M #define DFU_DEFAULT_POLL_TIMEOUT 300 /* TIZEN THOR downloader support */ #define CONFIG_CMD_THOR_DOWNLOAD -#define CONFIG_THOR_FUNCTION +#define CONFIG_USB_FUNCTION_THOR /* USB Samsung's IDs */ #define CONFIG_G_DNL_VENDOR_NUM 0x04E8 @@ -284,7 +284,7 @@ #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_OF_LIBFDT diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index c7affd6..09ba16d 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -250,7 +250,7 @@ #endif /* CONFIG_MUSB_GADGET */ #define CONFIG_USB_GADGET -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DOWNLOAD /* USB DRACO ID as default */ #define CONFIG_USBD_HS @@ -259,7 +259,7 @@ #define CONFIG_G_DNL_MANUFACTURER "Siemens AG" /* USB Device Firmware Update support */ -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_NAND #define CONFIG_CMD_DFU #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index e742acf..374ca8a 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -246,10 +246,10 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_USB_GADGET_VBUS_DRAW 2 /* USB Composite download gadget - g_dnl */ -#define CONFIG_USBDOWNLOAD_GADGET -#define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_USB_GADGET_DOWNLOAD +#define CONFIG_USB_FUNCTION_MASS_STORAGE -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC #define CONFIG_SYS_DFU_DATA_BUF_SIZE (32 * 1024 * 1024) #define DFU_DEFAULT_POLL_TIMEOUT 300 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index b7ad7df..4b3294f 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -170,10 +170,10 @@ #define CONFIG_CI_UDC #define CONFIG_USBD_HS #define CONFIG_USB_GADGET -#define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_USB_GADGET_DUALSPEED #define CONFIG_USB_GADGET_VBUS_DRAW 0 -#define CONFIG_USBDOWNLOAD_GADGET +#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 287460c..d70a4e7 100644 --- a/include/configs/tegra-common-usb-gadget.h +++ b/include/configs/tegra-common-usb-gadget.h @@ -18,12 +18,12 @@ #define CONFIG_G_DNL_VENDOR_NUM 0x0955 #define CONFIG_G_DNL_PRODUCT_NUM 0x701A #define CONFIG_G_DNL_MANUFACTURER "NVIDIA" -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_GADGET_DOWNLOAD /* USB mass storage protocol */ -#define CONFIG_USB_GADGET_MASS_STORAGE +#define CONFIG_USB_FUNCTION_MASS_STORAGE #define CONFIG_CMD_USB_MASS_STORAGE /* DFU protocol */ -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024) #define CONFIG_CMD_DFU #ifdef CONFIG_MMC diff --git a/include/configs/warp.h b/include/configs/warp.h index 2eb429e..5350a9a 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -140,8 +140,8 @@ #define CONFIG_USB_GADGET #define CONFIG_CMD_USB_MASS_STORAGE -#define CONFIG_USB_GADGET_MASS_STORAGE -#define CONFIG_USBDOWNLOAD_GADGET +#define CONFIG_USB_FUNCTION_MASS_STORAGE +#define CONFIG_USB_GADGET_DOWNLOAD #define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_G_DNL_VENDOR_NUM 0x0525 @@ -149,7 +149,7 @@ #define CONFIG_G_DNL_MANUFACTURER "FSL" #define CONFIG_CMD_DFU -#define CONFIG_DFU_FUNCTION +#define CONFIG_USB_FUNCTION_DFU #define CONFIG_DFU_MMC #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M #define DFU_DEFAULT_POLL_TIMEOUT 300 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index 926b381..4b9fda5 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -107,10 +107,10 @@ # define CONFIG_CI_UDC /* ChipIdea CI13xxx UDC */ # define CONFIG_USB_GADGET # define CONFIG_USB_GADGET_DUALSPEED -# define CONFIG_USBDOWNLOAD_GADGET +# define CONFIG_USB_GADGET_DOWNLOAD # define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000 # define DFU_DEFAULT_POLL_TIMEOUT 300 -# define CONFIG_DFU_FUNCTION +# define CONFIG_USB_FUNCTION_DFU # define CONFIG_DFU_RAM # define CONFIG_USB_GADGET_VBUS_DRAW 2 # define CONFIG_G_DNL_VENDOR_NUM 0x03FD @@ -120,7 +120,7 @@ # define CONFIG_USB_CABLE_CHECK # define CONFIG_CMD_DFU # define CONFIG_CMD_THOR_DOWNLOAD -# define CONFIG_THOR_FUNCTION +# define CONFIG_USB_FUNCTION_THOR # define DFU_ALT_INFO_RAM \ "dfu_ram_info=" \ "set dfu_alt_info " \
This introduces a coherent scheme for naming USB download gadget and functions config options. The download USB gadget config option is moved to CONFIG_USB_GADGET_DOWNLOAD for better consistency with other gadgets and each function's config option is moved to a CONFIG_USB_FUNCTION_ prefix. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> --- README | 2 +- board/samsung/common/Makefile | 2 +- board/siemens/common/factoryset.c | 4 ++-- doc/README.android-fastboot | 2 +- drivers/dfu/Makefile | 2 +- drivers/usb/gadget/Makefile | 8 ++++---- include/configs/am335x_evm.h | 4 ++-- include/configs/am43xx_evm.h | 4 ++-- include/configs/bav335x.h | 6 +++--- include/configs/colibri_vf.h | 6 +++--- include/configs/dra7xx_evm.h | 4 ++-- include/configs/exynos4-common.h | 8 ++++---- include/configs/gw_ventana.h | 4 ++-- include/configs/mx6sabre_common.h | 4 ++-- include/configs/nitrogen6x.h | 4 ++-- include/configs/omap3_beagle.h | 2 +- include/configs/s5p_goni.h | 8 ++++---- include/configs/siemens-am33x-common.h | 4 ++-- include/configs/socfpga_common.h | 6 +++--- include/configs/tbs2910.h | 4 ++-- include/configs/tegra-common-usb-gadget.h | 6 +++--- include/configs/warp.h | 6 +++--- include/configs/zynq-common.h | 6 +++--- 23 files changed, 53 insertions(+), 53 deletions(-)