Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 01acd6abbdd5a5951f68d08c245550c720ea6ad8

Authored by Paul Kocialkowski
Committed by Marek Vasut
1 parent f2226c0dbe
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

usb: USB download gadget and functions config options coherent naming 

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>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>

Test HW: Odroid_XU3 (Exynos5422), trats (Exynos4210)

Showing 24 changed files with 57 additions and 57 deletions Side-by-side Diff

... ... @@ -1671,7 +1671,7 @@
1671 1671 key for the Replay Protection Memory Block partition in eMMC.
1672 1672  
1673 1673 - USB Device Firmware Update (DFU) class support:
1674   - CONFIG_DFU_FUNCTION
  1674 + CONFIG_USB_FUNCTION_DFU
1675 1675 This enables the USB portion of the DFU USB class
1676 1676  
1677 1677 CONFIG_CMD_DFU
board/samsung/common/Makefile
Diff comments   View file @ 01acd6a
... ... @@ -6,7 +6,7 @@
6 6 #
7 7  
8 8 obj-$(CONFIG_SOFT_I2C_MULTI_BUS) += multi_i2c.o
9   -obj-$(CONFIG_USBDOWNLOAD_GADGET) += gadget.o
  9 +obj-$(CONFIG_USB_GADGET_DOWNLOAD) += gadget.o
10 10 obj-$(CONFIG_MISC_COMMON) += misc.o
11 11  
12 12 ifndef CONFIG_SPL_BUILD
board/siemens/common/factoryset.c
Diff comments   View file @ 01acd6a
... ... @@ -144,7 +144,7 @@
144 144 unsigned char eeprom_buf[0x3c00], hdr[4], buf[MAX_STRING_LENGTH];
145 145 unsigned char *cp, *cp1;
146 146  
147   -#if defined(CONFIG_DFU_FUNCTION)
  147 +#if defined(CONFIG_USB_FUNCTION_DFU)
148 148 factory_dat.usb_vendor_id = CONFIG_G_DNL_VENDOR_NUM;
149 149 factory_dat.usb_product_id = CONFIG_G_DNL_PRODUCT_NUM;
150 150 #endif
... ... @@ -202,7 +202,7 @@
202 202 cp1 += 3;
203 203 }
204 204  
205   -#if defined(CONFIG_DFU_FUNCTION)
  205 +#if defined(CONFIG_USB_FUNCTION_DFU)
206 206 /* read vid and pid for dfu mode */
207 207 if (0 <= get_factory_record_val(cp, size, (uchar *)"USBD1",
208 208 (uchar *)"vid", buf,
doc/README.android-fastboot
Diff comments   View file @ 01acd6a
... ... @@ -33,7 +33,7 @@
33 33 The fastboot gadget relies on the USB download gadget, so the following
34 34 options must be configured:
35 35  
36   -CONFIG_USBDOWNLOAD_GADGET
  36 +CONFIG_USB_GADGET_DOWNLOAD
37 37 CONFIG_G_DNL_VENDOR_NUM
38 38 CONFIG_G_DNL_PRODUCT_NUM
39 39 CONFIG_G_DNL_MANUFACTURER
drivers/dfu/Makefile
Diff comments   View file @ 01acd6a
... ... @@ -5,7 +5,7 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -obj-$(CONFIG_DFU_FUNCTION) += dfu.o
  8 +obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o
9 9 obj-$(CONFIG_DFU_MMC) += dfu_mmc.o
10 10 obj-$(CONFIG_DFU_NAND) += dfu_nand.o
11 11 obj-$(CONFIG_DFU_RAM) += dfu_ram.o
drivers/usb/gadget/Makefile
Diff comments   View file @ 01acd6a
... ... @@ -15,10 +15,10 @@
15 15 obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG_PHY) += s3c_udc_otg_phy.o
16 16 obj-$(CONFIG_USB_GADGET_FOTG210) += fotg210.o
17 17 obj-$(CONFIG_CI_UDC) += ci_udc.o
18   -obj-$(CONFIG_THOR_FUNCTION) += f_thor.o
19   -obj-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o
20   -obj-$(CONFIG_DFU_FUNCTION) += f_dfu.o
21   -obj-$(CONFIG_USB_GADGET_MASS_STORAGE) += f_mass_storage.o
  18 +obj-$(CONFIG_USB_GADGET_DOWNLOAD) += g_dnl.o
  19 +obj-$(CONFIG_USB_FUNCTION_THOR) += f_thor.o
  20 +obj-$(CONFIG_USB_FUNCTION_DFU) += f_dfu.o
  21 +obj-$(CONFIG_USB_FUNCTION_MASS_STORAGE) += f_mass_storage.o
22 22 obj-$(CONFIG_CMD_FASTBOOT) += f_fastboot.o
23 23 endif
24 24 ifdef CONFIG_USB_ETHER
include/configs/am335x_evm.h
Diff comments   View file @ 01acd6a
... ... @@ -287,7 +287,7 @@
287 287 #define CONFIG_MUSB_PIO_ONLY
288 288 #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
289 289 #define CONFIG_USB_GADGET
290   -#define CONFIG_USBDOWNLOAD_GADGET
  290 +#define CONFIG_USB_GADGET_DOWNLOAD
291 291 #define CONFIG_USB_GADGET_DUALSPEED
292 292 #define CONFIG_USB_GADGET_VBUS_DRAW 2
293 293 #define CONFIG_MUSB_HOST
... ... @@ -344,7 +344,7 @@
344 344  
345 345 /* USB Device Firmware Update support */
346 346 #ifndef CONFIG_SPL_BUILD
347   -#define CONFIG_DFU_FUNCTION
  347 +#define CONFIG_USB_FUNCTION_DFU
348 348 #define CONFIG_DFU_MMC
349 349 #define CONFIG_CMD_DFU
350 350 #define DFU_ALT_INFO_MMC \
include/configs/am43xx_evm.h
Diff comments   View file @ 01acd6a
... ... @@ -128,7 +128,7 @@
128 128 #define CONFIG_USB_DWC3_GADGET
129 129  
130 130 #define CONFIG_USB_GADGET
131   -#define CONFIG_USBDOWNLOAD_GADGET
  131 +#define CONFIG_USB_GADGET_DOWNLOAD
132 132 #define CONFIG_USB_GADGET_VBUS_DRAW 2
133 133 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
134 134 #define CONFIG_G_DNL_VENDOR_NUM 0x0403
... ... @@ -138,7 +138,7 @@
138 138  
139 139 #ifndef CONFIG_SPL_BUILD
140 140 /* USB Device Firmware Update support */
141   -#define CONFIG_DFU_FUNCTION
  141 +#define CONFIG_USB_FUNCTION_DFU
142 142 #define CONFIG_DFU_RAM
143 143 #define CONFIG_CMD_DFU
144 144  
include/configs/bav335x.h
Diff comments   View file @ 01acd6a
... ... @@ -444,7 +444,7 @@
444 444 #define CONFIG_MUSB_PIO_ONLY
445 445 #define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
446 446 #define CONFIG_USB_GADGET
447   -#define CONFIG_USBDOWNLOAD_GADGET
  447 +#define CONFIG_USB_GADGET_DOWNLOAD
448 448 #define CONFIG_USB_GADGET_DUALSPEED
449 449 #define CONFIG_USB_GADGET_VBUS_DRAW 2
450 450 #define CONFIG_MUSB_HOST
... ... @@ -472,7 +472,7 @@
472 472  
473 473 #ifdef CONFIG_MUSB_GADGET
474 474 #define CONFIG_CMD_USB_MASS_STORAGE
475   -#define CONFIG_USB_GADGET_MASS_STORAGE
  475 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
476 476  
477 477 /* USB TI's IDs */
478 478 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
... ... @@ -494,7 +494,7 @@
494 494  
495 495 /* USB Device Firmware Update support */
496 496 #ifndef CONFIG_SPL_BUILD
497   -#define CONFIG_DFU_FUNCTION
  497 +#define CONFIG_USB_FUNCTION_DFU
498 498 #define CONFIG_DFU_MMC
499 499 #define CONFIG_CMD_DFU
500 500 #define DFU_ALT_INFO_MMC \
include/configs/colibri_vf.h
Diff comments   View file @ 01acd6a
... ... @@ -257,16 +257,16 @@
257 257 #define CONFIG_G_DNL_PRODUCT_NUM CONFIG_TRDX_PID_COLIBRI_VF50
258 258  
259 259 /* USB DFU */
260   -#define CONFIG_USBDOWNLOAD_GADGET
  260 +#define CONFIG_USB_GADGET_DOWNLOAD
261 261 #define CONFIG_CMD_DFU
262   -#define CONFIG_DFU_FUNCTION
  262 +#define CONFIG_USB_FUNCTION_DFU
263 263 #define CONFIG_DFU_NAND
264 264 #define CONFIG_DFU_MMC
265 265 #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024)
266 266  
267 267 /* USB Storage */
268 268 #define CONFIG_USB_STORAGE
269   -#define CONFIG_USB_GADGET_MASS_STORAGE
  269 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
270 270 #define CONFIG_CMD_USB_MASS_STORAGE
271 271  
272 272 /* Enable SPI support */
include/configs/dra7xx_evm.h
Diff comments   View file @ 01acd6a
... ... @@ -190,7 +190,7 @@
190 190 #define CONFIG_USB_DWC3_GADGET
191 191  
192 192 #define CONFIG_USB_GADGET
193   -#define CONFIG_USBDOWNLOAD_GADGET
  193 +#define CONFIG_USB_GADGET_DOWNLOAD
194 194 #define CONFIG_USB_GADGET_VBUS_DRAW 2
195 195 #define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
196 196 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
... ... @@ -198,7 +198,7 @@
198 198 #define CONFIG_USB_GADGET_DUALSPEED
199 199  
200 200 /* USB Device Firmware Update support */
201   -#define CONFIG_DFU_FUNCTION
  201 +#define CONFIG_USB_FUNCTION_DFU
202 202 #define CONFIG_DFU_RAM
203 203 #define CONFIG_CMD_DFU
204 204  
include/configs/exynos4-common.h
Diff comments   View file @ 01acd6a
... ... @@ -28,13 +28,13 @@
28 28 #define CONFIG_CMD_GPT
29 29  
30 30 /* USB Composite download gadget - g_dnl */
31   -#define CONFIG_USBDOWNLOAD_GADGET
  31 +#define CONFIG_USB_GADGET_DOWNLOAD
32 32  
33 33 /* TIZEN THOR downloader support */
34 34 #define CONFIG_CMD_THOR_DOWNLOAD
35   -#define CONFIG_THOR_FUNCTION
  35 +#define CONFIG_USB_FUNCTION_THOR
36 36  
37   -#define CONFIG_DFU_FUNCTION
  37 +#define CONFIG_USB_FUNCTION_DFU
38 38 #define CONFIG_DFU_MMC
39 39 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M
40 40 #define DFU_DEFAULT_POLL_TIMEOUT 300
... ... @@ -57,7 +57,7 @@
57 57 #define CONFIG_USB_GADGET_VBUS_DRAW 2
58 58  
59 59 #define CONFIG_CMD_USB_MASS_STORAGE
60   -#define CONFIG_USB_GADGET_MASS_STORAGE
  60 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
61 61  
62 62 /* Common environment variables */
63 63 #define CONFIG_EXTRA_ENV_ITB \
include/configs/gw_ventana.h
Diff comments   View file @ 01acd6a
... ... @@ -205,8 +205,8 @@
205 205 /* USB Mass Storage Gadget */
206 206 #define CONFIG_USB_GADGET
207 207 #define CONFIG_CMD_USB_MASS_STORAGE
208   -#define CONFIG_USB_GADGET_MASS_STORAGE
209   -#define CONFIG_USBDOWNLOAD_GADGET
  208 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
  209 +#define CONFIG_USB_GADGET_DOWNLOAD
210 210 #define CONFIG_USB_GADGET_VBUS_DRAW 2
211 211  
212 212 /* Netchip IDs */
include/configs/mx6sabre_common.h
Diff comments   View file @ 01acd6a
... ... @@ -217,8 +217,8 @@
217 217  
218 218 #define CONFIG_USB_GADGET
219 219 #define CONFIG_CMD_USB_MASS_STORAGE
220   -#define CONFIG_USB_GADGET_MASS_STORAGE
221   -#define CONFIG_USBDOWNLOAD_GADGET
  220 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
  221 +#define CONFIG_USB_GADGET_DOWNLOAD
222 222 #define CONFIG_USB_GADGET_VBUS_DRAW 2
223 223  
224 224 #define CONFIG_G_DNL_VENDOR_NUM 0x0525
include/configs/nitrogen6x.h
Diff comments   View file @ 01acd6a
... ... @@ -337,8 +337,8 @@
337 337  
338 338 #define CONFIG_USB_GADGET
339 339 #define CONFIG_CMD_USB_MASS_STORAGE
340   -#define CONFIG_USB_GADGET_MASS_STORAGE
341   -#define CONFIG_USBDOWNLOAD_GADGET
  340 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
  341 +#define CONFIG_USB_GADGET_DOWNLOAD
342 342 #define CONFIG_USB_GADGET_VBUS_DRAW 2
343 343  
344 344 /* Netchip IDs */
include/configs/odroid_xu3.h
Diff comments   View file @ 01acd6a
... ... @@ -60,10 +60,10 @@
60 60 #define CONFIG_G_DNL_VENDOR_NUM 0x04E8
61 61 #define CONFIG_G_DNL_PRODUCT_NUM 0x6601
62 62 #define CONFIG_G_DNL_MANUFACTURER "Samsung"
63   -#define CONFIG_USBDOWNLOAD_GADGET
  63 +#define CONFIG_USB_GADGET_DOWNLOAD
64 64  
65 65 /* DFU */
66   -#define CONFIG_DFU_FUNCTION
  66 +#define CONFIG_USB_FUNCTION_DFU
67 67 #define CONFIG_DFU_MMC
68 68 #define CONFIG_CMD_DFU
69 69 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M
70 70  
... ... @@ -72,13 +72,13 @@
72 72 /* THOR */
73 73 #define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM
74 74 #define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
75   -#define CONFIG_THOR_FUNCTION
  75 +#define CONFIG_USB_FUNCTION_THOR
76 76 #define CONFIG_CMD_THOR_DOWNLOAD
77 77  
78 78 /* UMS */
79 79 #define CONFIG_G_DNL_UMS_VENDOR_NUM 0x0525
80 80 #define CONFIG_G_DNL_UMS_PRODUCT_NUM 0xA4A5
81   -#define CONFIG_USB_GADGET_MASS_STORAGE
  81 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
82 82 #define CONFIG_CMD_USB_MASS_STORAGE
83 83  
84 84 /* FIXME: MUST BE REMOVED AFTER TMU IS TURNED ON */
include/configs/omap3_beagle.h
Diff comments   View file @ 01acd6a
... ... @@ -68,7 +68,7 @@
68 68 #define CONFIG_USB_ETHER_RNDIS
69 69 #define CONFIG_USB_GADGET
70 70 #define CONFIG_USB_GADGET_VBUS_DRAW 0
71   -#define CONFIG_USBDOWNLOAD_GADGET
  71 +#define CONFIG_USB_GADGET_DOWNLOAD
72 72 #define CONFIG_G_DNL_VENDOR_NUM 0x0451
73 73 #define CONFIG_G_DNL_PRODUCT_NUM 0xd022
74 74 #define CONFIG_G_DNL_MANUFACTURER "TI"
include/configs/s5p_goni.h
Diff comments   View file @ 01acd6a
... ... @@ -68,15 +68,15 @@
68 68 #define CONFIG_CMD_GPT
69 69  
70 70 /* USB Composite download gadget - g_dnl */
71   -#define CONFIG_USBDOWNLOAD_GADGET
72   -#define CONFIG_DFU_FUNCTION
  71 +#define CONFIG_USB_GADGET_DOWNLOAD
  72 +#define CONFIG_USB_FUNCTION_DFU
73 73 #define CONFIG_DFU_MMC
74 74 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M
75 75 #define DFU_DEFAULT_POLL_TIMEOUT 300
76 76  
77 77 /* TIZEN THOR downloader support */
78 78 #define CONFIG_CMD_THOR_DOWNLOAD
79   -#define CONFIG_THOR_FUNCTION
  79 +#define CONFIG_USB_FUNCTION_THOR
80 80  
81 81 /* USB Samsung's IDs */
82 82 #define CONFIG_G_DNL_VENDOR_NUM 0x04E8
... ... @@ -275,7 +275,7 @@
275 275 #define CONFIG_USB_GADGET_DUALSPEED
276 276 #define CONFIG_USB_GADGET_VBUS_DRAW 2
277 277 #define CONFIG_CMD_USB_MASS_STORAGE
278   -#define CONFIG_USB_GADGET_MASS_STORAGE
  278 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
279 279  
280 280 #define CONFIG_OF_LIBFDT
281 281  
include/configs/siemens-am33x-common.h
Diff comments   View file @ 01acd6a
... ... @@ -249,7 +249,7 @@
249 249 #endif /* CONFIG_MUSB_GADGET */
250 250  
251 251 #define CONFIG_USB_GADGET
252   -#define CONFIG_USBDOWNLOAD_GADGET
  252 +#define CONFIG_USB_GADGET_DOWNLOAD
253 253  
254 254 /* USB DRACO ID as default */
255 255 #define CONFIG_USBD_HS
... ... @@ -258,7 +258,7 @@
258 258 #define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
259 259  
260 260 /* USB Device Firmware Update support */
261   -#define CONFIG_DFU_FUNCTION
  261 +#define CONFIG_USB_FUNCTION_DFU
262 262 #define CONFIG_DFU_NAND
263 263 #define CONFIG_CMD_DFU
264 264 #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20)
include/configs/socfpga_common.h
Diff comments   View file @ 01acd6a
... ... @@ -243,10 +243,10 @@
243 243 #define CONFIG_USB_GADGET_VBUS_DRAW 2
244 244  
245 245 /* USB Composite download gadget - g_dnl */
246   -#define CONFIG_USBDOWNLOAD_GADGET
247   -#define CONFIG_USB_GADGET_MASS_STORAGE
  246 +#define CONFIG_USB_GADGET_DOWNLOAD
  247 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
248 248  
249   -#define CONFIG_DFU_FUNCTION
  249 +#define CONFIG_USB_FUNCTION_DFU
250 250 #define CONFIG_DFU_MMC
251 251 #define CONFIG_SYS_DFU_DATA_BUF_SIZE (32 * 1024 * 1024)
252 252 #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/tbs2910.h
Diff comments   View file @ 01acd6a
... ... @@ -133,10 +133,10 @@
133 133 #define CONFIG_CI_UDC
134 134 #define CONFIG_USBD_HS
135 135 #define CONFIG_USB_GADGET
136   -#define CONFIG_USB_GADGET_MASS_STORAGE
  136 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
137 137 #define CONFIG_USB_GADGET_DUALSPEED
138 138 #define CONFIG_USB_GADGET_VBUS_DRAW 0
139   -#define CONFIG_USBDOWNLOAD_GADGET
  139 +#define CONFIG_USB_GADGET_DOWNLOAD
140 140 #define CONFIG_G_DNL_VENDOR_NUM 0x0525
141 141 #define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
142 142 #define CONFIG_G_DNL_MANUFACTURER "TBS"
include/configs/tegra-common-usb-gadget.h
Diff comments   View file @ 01acd6a
... ... @@ -18,12 +18,12 @@
18 18 #define CONFIG_G_DNL_VENDOR_NUM 0x0955
19 19 #define CONFIG_G_DNL_PRODUCT_NUM 0x701A
20 20 #define CONFIG_G_DNL_MANUFACTURER "NVIDIA"
21   -#define CONFIG_USBDOWNLOAD_GADGET
  21 +#define CONFIG_USB_GADGET_DOWNLOAD
22 22 /* USB mass storage protocol */
23   -#define CONFIG_USB_GADGET_MASS_STORAGE
  23 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
24 24 #define CONFIG_CMD_USB_MASS_STORAGE
25 25 /* DFU protocol */
26   -#define CONFIG_DFU_FUNCTION
  26 +#define CONFIG_USB_FUNCTION_DFU
27 27 #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 * 1024 * 1024)
28 28 #define CONFIG_CMD_DFU
29 29 #ifdef CONFIG_MMC
include/configs/warp.h
Diff comments   View file @ 01acd6a
... ... @@ -80,8 +80,8 @@
80 80  
81 81 #define CONFIG_USB_GADGET
82 82 #define CONFIG_CMD_USB_MASS_STORAGE
83   -#define CONFIG_USB_GADGET_MASS_STORAGE
84   -#define CONFIG_USBDOWNLOAD_GADGET
  83 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
  84 +#define CONFIG_USB_GADGET_DOWNLOAD
85 85 #define CONFIG_USB_GADGET_VBUS_DRAW 2
86 86  
87 87 #define CONFIG_G_DNL_VENDOR_NUM 0x0525
... ... @@ -89,7 +89,7 @@
89 89 #define CONFIG_G_DNL_MANUFACTURER "FSL"
90 90  
91 91 #define CONFIG_CMD_DFU
92   -#define CONFIG_DFU_FUNCTION
  92 +#define CONFIG_USB_FUNCTION_DFU
93 93 #define CONFIG_DFU_MMC
94 94 #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M
95 95 #define DFU_DEFAULT_POLL_TIMEOUT 300
include/configs/zynq-common.h
Diff comments   View file @ 01acd6a
... ... @@ -110,10 +110,10 @@
110 110 # define CONFIG_CI_UDC /* ChipIdea CI13xxx UDC */
111 111 # define CONFIG_USB_GADGET
112 112 # define CONFIG_USB_GADGET_DUALSPEED
113   -# define CONFIG_USBDOWNLOAD_GADGET
  113 +# define CONFIG_USB_GADGET_DOWNLOAD
114 114 # define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x600000
115 115 # define DFU_DEFAULT_POLL_TIMEOUT 300
116   -# define CONFIG_DFU_FUNCTION
  116 +# define CONFIG_USB_FUNCTION_DFU
117 117 # define CONFIG_DFU_RAM
118 118 # define CONFIG_USB_GADGET_VBUS_DRAW 2
119 119 # define CONFIG_G_DNL_VENDOR_NUM 0x03FD
... ... @@ -123,7 +123,7 @@
123 123 # define CONFIG_USB_CABLE_CHECK
124 124 # define CONFIG_CMD_DFU
125 125 # define CONFIG_CMD_THOR_DOWNLOAD
126   -# define CONFIG_THOR_FUNCTION
  126 +# define CONFIG_USB_FUNCTION_THOR
127 127 # define DFU_ALT_INFO_RAM \
128 128 "dfu_ram_info=" \
129 129 "set dfu_alt_info " \