usb: USB download gadget and functions config options coherent naming

USB download gadget functions such as thor and dfu have a separate config option for the USB gadget part of the code, independent from the command part. This switches the fastboot USB gadget to the same scheme, for better consistency.

Signed-off-by Paul Kocialkowski <[email protected]>

---
 README                                       | 3 +++
 arch/arm/cpu/armv7/omap-common/boot-common.c | 2 +-
 doc/README.android-fastboot                  | 4 ++--
 drivers/usb/gadget/Makefile                  | 2 +-
 include/configs/am335x_evm.h                 | 1 +
 include/configs/bav335x.h                    | 1 +
 include/configs/dra7xx_evm.h                 | 1 +
 include/configs/nitrogen6x.h                 | 1 +
 include/configs/omap3_beagle.h               | 1 +
 9 files changed, 12 insertions(+), 4 deletions(-)

README +3 -0

index ba3fa49..470210a 100644
@@ -1717,6 +1717,9 @@ The following options need to be configured:
 		sending again an USB request to the device.
 
 - USB Device Android Fastboot support:
+		CONFIG_USB_FUNCTION_FASTBOOT
+		This enables the USB part of the fastboot gadget
+
 		CONFIG_CMD_FASTBOOT
 		This enables the command "fastboot" which enables

the Android fastboot mode for the platform's USB device. Fastboot is a USB diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index bbc6bed..7fc0a56 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c

README +1 -1

@@ -163,7 +163,7 @@ void arch_preboot_os(void)
 }
 #endif
 
-#if defined(CONFIG_CMD_FASTBOOT) && !defined(CONFIG_ENV_IS_NOWHERE)
+#if defined(CONFIG_USB_FUNCTION_FASTBOOT)
 && !defined(CONFIG_ENV_IS_NOWHERE) int fb_set_reboot_flag(void)
 {
 	printf("Setting reboot to fastboot flag ...\n");

doc/README.android-fastboot +0 -0

index c2a2418..92f2897 100644
@@ -42,8 +42,8 @@ NOTE: The CONFIG_G_DNL_VENDOR_NUM must be one of

the numbers supported by the fastboot client. The list of vendor IDs supported can be found in the fastboot client source code (fastboot.c) mentioned above.

doc/README.android-fastboot +1 -2

-The fastboot function is enabled by defining CONFIG_CMD_FASTBOOT and
-CONFIG_ANDROID_BOOT_IMAGE.
+The fastboot function is enabled by defining

CONFIG_USB_FUNCTION_FASTBOOT, +CONFIG_CMD_FASTBOOT and CONFIG_ANDROID_BOOT_IMAGE.
The fastboot protocol requires a large memory buffer for downloads.
This buffer should be as large as possible for a platform. The location of the diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 46d7d94..4e15323 100644

drivers/usb/gadget/Makefile +1 -1

@@ -19,7 +19,7 @@ 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
+obj-$(CONFIG_USB_FUNCTION_FASTBOOT) += f_fastboot.o
 endif
 ifdef CONFIG_USB_ETHER
 obj-y += ether.o

(quoted diff) +0 -0

b/include/configs/am335x_evm.h index b94e4b5..8aa3fd7 100644

include/configs/am335x_evm.h +1 -0

@@ -298,6 +298,7 @@
 
 #ifndef CONFIG_SPL_USBETH_SUPPORT
 /* Fastboot */
+#define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
 #define CONFIG_ANDROID_BOOT_IMAGE
 #define CONFIG_USB_FASTBOOT_BUF_ADDR	CONFIG_SYS_LOAD_ADDR

include/configs/bav335x.h +1 -0

index 7ce568b..99e3a00 100644
@@ -455,6 +455,7 @@ DEFAULT_LINUX_BOOT_ENV \
 
 #ifndef CONFIG_SPL_USBETH_SUPPORT
 /* Fastboot */
+#define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
 #define CONFIG_ANDROID_BOOT_IMAGE
 #define CONFIG_USB_FASTBOOT_BUF_ADDR	CONFIG_SYS_LOAD_ADDR

(quoted diff) +0 -0

b/include/configs/dra7xx_evm.h index c5ce741..0826235 100644

include/configs/dra7xx_evm.h +1 -0

@@ -85,6 +85,7 @@
 	DFU_ALT_INFO_RAM
 
 /* Fastboot */
+#define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
 #define CONFIG_ANDROID_BOOT_IMAGE
 #define CONFIG_USB_FASTBOOT_BUF_ADDR    CONFIG_SYS_LOAD_ADDR

(quoted diff) +0 -0

b/include/configs/nitrogen6x.h index 53ee997..3ba7476 100644

include/configs/nitrogen6x.h +1 -0

@@ -416,6 +416,7 @@
 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
 #define CONFIG_G_DNL_MANUFACTURER "Boundary"
 
+#define CONFIG_USB_FUNCTION_FASTBOOT
 #define CONFIG_CMD_FASTBOOT
 #define CONFIG_ANDROID_BOOT_IMAGE
 #define CONFIG_USB_FASTBOOT_BUF_ADDR   CONFIG_SYS_LOAD_ADDR

(quoted diff) +0 -0

b/include/configs/omap3_beagle.h index 1e7a158..293a2d7 100644

Each USB download function command calls board_usb_init before registering the USB gadget and board_usb_cleanup after de-registering it. On devices currently using fasboot, musb-new is usually initialized earlier, but some other boards might need the board_usb_init call to properly initialize musb-new.

This requires adding an argument (the USB controller index) to the fastboot command, as it is currently done with other USB download gadget functions.

Signed-off-by Paul Kocialkowski <[email protected]>

---
 common/cmd_fastboot.c             | 31

+++++++++++++++++++++++++------ include/configs/ti_omap5_common.h | 2 +- 2 files changed, 26 insertions(+), 7 deletions(-)

common/cmd_fastboot.c +25 -6

index d52ccfb..86fbddf 100644
@@ -10,11 +10,26 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char
 *const argv[]) {
+	int controller_index;
+	char *usb_controller;
 	int ret;
 
+	if (argc < 2)
+		return CMD_RET_USAGE;
+
+	usb_controller = argv[1];
+	controller_index = simple_strtoul(usb_controller, NULL, 0);
+
+	ret = board_usb_init(controller_index, USB_INIT_DEVICE);
+	if (ret) {
+		error("USB init failed: %d", ret);
+		return CMD_RET_FAILURE;
+	}
+
 	g_dnl_clear_detach();
 	ret = g_dnl_register("usb_dnl_fastboot");
 	if (ret)

@@ -23,9 +38,8 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int flag,
 int argc, char *const argv[]) if (!g_dnl_board_usb_cable_connected())
 { puts("\rUSB cable not detected.\n" \
 		     "Command exit.\n");
-		g_dnl_unregister();
-		g_dnl_clear_detach();
-		return CMD_RET_FAILURE;
+		ret = CMD_RET_FAILURE;
+		goto exit;
 	}
 
 	while (1) {

@@ -36,14 +50,19 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int
 flag, int argc, char *const argv[]) usb_gadget_handle_interrupts(0);
 	}
 
+	ret = CMD_RET_SUCCESS;
+
+exit:
 	g_dnl_unregister();
 	g_dnl_clear_detach();
-	return CMD_RET_SUCCESS;
+	board_usb_cleanup(controller_index, USB_INIT_DEVICE);
+
+	return ret;
 }
 
 U_BOOT_CMD(
-	fastboot,	1,	0,	do_fastboot,
+	fastboot, 2, 1, do_fastboot,
 	"use USB Fastboot protocol",
-	"\n"
+	"<USB_controller>\n"
 	"    - run as a fastboot usb device"
 );

(quoted diff) +0 -0

b/include/configs/ti_omap5_common.h index 3383491..dd1dcf5 100644

Weak versions of board_usb_init and board_usb_cleanup are defined in common USB host code, but it is also used for USB device gadgets, so we also need a weak definition of it when there is no USB host enabled. Both weak definitions do not conflict.

Signed-off-by Paul Kocialkowski <[email protected]>

---
 drivers/usb/gadget/g_dnl.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

drivers/usb/gadget/g_dnl.c +6 -0

index ee52a29..ad89a0d 100644
@@ -12,6 +12,7 @@
 
 #include <mmc.h>
 #include <part.h>
+#include <usb.h>
 
 #include <g_dnl.h>
 #include <usb_mass_storage.h>

@@ -148,6 +149,18 @@ static int g_dnl_config_register(struct
 usb_composite_dev *cdev) }
 
 __weak
+int board_usb_init(int index, enum usb_init_type init)
+{
+	return 0;
+}
+

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 <[email protected]>

---
 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(-)

README +0 -0

index 1ea397a..ba3fa49 100644
@@ -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:

README +1 -1

-		CONFIG_DFU_FUNCTION
+		CONFIG_USB_FUNCTION_DFU
 		This enables the USB portion of the DFU USB class
 
 		CONFIG_CMD_DFU

(quoted diff) +0 -0

b/board/samsung/common/Makefile index 93347ef..5fb01ce 100644

board/samsung/common/Makefile +1 -1

@@ -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

(quoted diff) +0 -0

b/board/siemens/common/factoryset.c index d81f548..6c869ed 100644

board/siemens/common/factoryset.c +2 -2

@@ -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,

doc/README.android-fastboot +0 -0

index 04411e9..c2a2418 100644
@@ -33,7 +33,7 @@ Board specific
 The fastboot gadget relies on the USB download gadget, so the

following options must be configured:

doc/README.android-fastboot +1 -1

-CONFIG_USBDOWNLOAD_GADGET
+CONFIG_USB_GADGET_DOWNLOAD
 CONFIG_G_DNL_VENDOR_NUM
 CONFIG_G_DNL_PRODUCT_NUM
 CONFIG_G_DNL_MANUFACTURER

drivers/dfu/Makefile +1 -1

index 5cc535e..cebea30 100644
@@ -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

drivers/usb/gadget/Makefile +0 -0

index 70bb550..46d7d94 100644
@@ -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

drivers/usb/gadget/Makefile +4 -4

-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

(quoted diff) +0 -0

b/include/configs/am335x_evm.h index 8da3325..b94e4b5 100644

include/configs/am335x_evm.h +2 -2

@@ -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 \

(quoted diff) +0 -0

b/include/configs/am43xx_evm.h index 331fdac..2e839b5 100644

include/configs/am43xx_evm.h +2 -2

@@ -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
 

include/configs/bav335x.h +3 -3

index 490c53e..7ce568b 100644
@@ -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 \

(quoted diff) +0 -0

b/include/configs/colibri_vf.h index 414600a..b4a9108 100644

include/configs/colibri_vf.h +3 -3

@@ -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 */

(quoted diff) +0 -0

b/include/configs/dra7xx_evm.h index d79612b..c5ce741 100644

include/configs/dra7xx_evm.h +2 -2

@@ -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
 

(quoted diff) +0 -0

b/include/configs/exynos4-common.h index dbe05e4..6d1aad5 100644

include/configs/exynos4-common.h +4 -4

@@ -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 \

(quoted diff) +0 -0

b/include/configs/gw_ventana.h index b20b338..5d5c51e 100644

include/configs/gw_ventana.h +2 -2

@@ -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 */

(quoted diff) +0 -0

b/include/configs/mx6sabre_common.h index b72522b..1240af7 100644

include/configs/mx6sabre_common.h +2 -2

@@ -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

(quoted diff) +0 -0

b/include/configs/nitrogen6x.h index eaa2c2c..53ee997 100644

include/configs/nitrogen6x.h +2 -2

@@ -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 */

(quoted diff) +0 -0

b/include/configs/omap3_beagle.h index f25a940..1e7a158 100644

include/configs/omap3_beagle.h +1 -1

@@ -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"

include/configs/s5p_goni.h +4 -4

index 8fadc68..6f4f9a0 100644
@@ -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
 

(quoted diff) +0 -0

b/include/configs/siemens-am33x-common.h index c7affd6..09ba16d 100644

include/configs/siemens-am33x-common.h +2 -2

@@ -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)

(quoted diff) +0 -0

b/include/configs/socfpga_common.h index e742acf..374ca8a 100644

include/configs/socfpga_common.h +0 -0

@@ -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 */

include/configs/socfpga_common.h +3 -3

-#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

include/configs/tbs2910.h +2 -2

index b7ad7df..4b3294f 100644
@@ -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"

(quoted diff) +0 -0

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

include/configs/tegra-common-usb-gadget.h +3 -3

@@ -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

include/configs/warp.h +3 -3

index 2eb429e..5350a9a 100644
@@ -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

(quoted diff) +0 -0

b/include/configs/zynq-common.h index 926b381..4b9fda5 100644

include/configs/zynq-common.h +2 -2

@@ -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

Hi Paul,

Quoted 8 lines

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 <[email protected]>

---

Acked-by Lukasz Majewski <[email protected]>

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 :

Quoted 10 lines

Hi Paul,

Quoted 8 lines

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 <[email protected]>

---

[snip]

Quoted 4 lines

Acked-by Lukasz Majewski <[email protected]>

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,

Quoted 12 lines

Le lundi 18 mai 2015 ? 15:01 +0200, Lukasz Majewski a ?crit :

Quoted 10 lines

Hi Paul,

Quoted 8 lines

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 <[email protected]>

---

Quoted 9 lines

[snip]

Quoted 4 lines

Acked-by Lukasz Majewski <[email protected]>

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 :

Quoted 32 lines

Hi Paul,

Quoted 12 lines

Le lundi 18 mai 2015 ? 15:01 +0200, Lukasz Majewski a ?crit :

Quoted 10 lines

Hi Paul,

Quoted 8 lines

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 <[email protected]>

---

Quoted 9 lines

[snip]

Quoted 4 lines

Acked-by Lukasz Majewski <[email protected]>

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

Quoted 4 lines

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.

Quoted 38 lines · On Fri, 12 Jun 2015 19:59:22 +0200 Paul Kocialkowski <[email protected]> wrote:

Le vendredi 12 juin 2015 ? 16:10 +0200, Lukasz Majewski a ?crit :

Quoted 36 lines

Hi Paul,

Quoted 12 lines

Le lundi 18 mai 2015 ? 15:01 +0200, Lukasz Majewski a ?crit :

Quoted 10 lines

Hi Paul,

Quoted 8 lines

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 <[email protected]>

---

Quoted 9 lines

[snip]

Quoted 4 lines

Acked-by Lukasz Majewski <[email protected]>

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).

Quoted 2 lines

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.

Quoted 2 lines

Thanks for pointing this out.

No problem :-). You were first "victim" of my automated building and testing setup :-).