Skip to content

Commit 6c96da5

Browse files
sakumisuRbb666
sakumisu
authored and
Rbb666
committed
update(cherryusb): update to v1.3.1
1 parent 4cca943 commit 6c96da5

File tree

2 files changed

+43
-39
lines changed

2 files changed

+43
-39
lines changed

‎system/CherryUSB/Kconfig

+38-39
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,16 @@ if PKG_USING_CHERRYUSB
3636
bool "dwc2_at"
3737
config PKG_CHERRYUSB_DEVICE_DWC2_GD
3838
bool "dwc2_gd"
39+
config PKG_CHERRYUSB_DEVICE_DWC2_HC
40+
bool "dwc2_hc"
3941
config PKG_CHERRYUSB_DEVICE_DWC2_CUSTOM
4042
bool "dwc2_custom"
41-
config PKG_CHERRYUSB_DEVICE_MUSB_STANDARD
42-
bool "musb_standard"
43+
config PKG_CHERRYUSB_DEVICE_MUSB_ES
44+
bool "musb_es"
4345
config PKG_CHERRYUSB_DEVICE_MUSB_SUNXI
4446
bool "musb_sunxi"
47+
config PKG_CHERRYUSB_DEVICE_MUSB_BK
48+
bool "musb_bk"
4549
config PKG_CHERRYUSB_DEVICE_MUSB_CUSTOM
4650
bool "musb_custom"
4751
config PKG_CHERRYUSB_DEVICE_BL
@@ -170,10 +174,12 @@ if PKG_USING_CHERRYUSB
170174
bool "dwc2_esp"
171175
config PKG_CHERRYUSB_HOST_DWC2_CUSTOM
172176
bool "dwc2_custom"
173-
config PKG_CHERRYUSB_HOST_MUSB_STANDARD
174-
bool "musb_standard"
177+
config PKG_CHERRYUSB_HOST_MUSB_ES
178+
bool "musb_es"
175179
config PKG_CHERRYUSB_HOST_MUSB_SUNXI
176180
bool "musb_sunxi"
181+
config PKG_CHERRYUSB_HOST_MUSB_BK
182+
bool "musb_bk"
177183
config PKG_CHERRYUSB_HOST_MUSB_CUSTOM
178184
bool "musb_custom"
179185
config PKG_CHERRYUSB_HOST_PUSB2
@@ -198,25 +204,28 @@ if PKG_USING_CHERRYUSB
198204
default n
199205
select RT_USING_DFS
200206

201-
config PKG_CHERRYUSB_HOST_CDC_RNDIS
207+
config PKG_CHERRYUSB_HOST_CDC_ECM
202208
bool
203-
prompt "Enable usb rndis driver"
209+
prompt "Enable usb cdc ecm driver"
204210
select RT_USING_LWIP
205211
select RT_USING_LWIP212
212+
select CONFIG_USBHOST_PLATFORM_CDC_ECM
206213
default n
207214

208-
config PKG_CHERRYUSB_HOST_CDC_ECM
215+
config PKG_CHERRYUSB_HOST_CDC_RNDIS
209216
bool
210-
prompt "Enable usb cdc ecm driver"
217+
prompt "Enable usb rndis driver"
211218
select RT_USING_LWIP
212219
select RT_USING_LWIP212
220+
select CONFIG_USBHOST_PLATFORM_CDC_RNDIS
213221
default n
214222

215223
config PKG_CHERRYUSB_HOST_CDC_NCM
216224
bool
217225
prompt "Enable usb cdc ncm driver"
218226
select RT_USING_LWIP
219227
select RT_USING_LWIP212
228+
select CONFIG_USBHOST_PLATFORM_CDC_NCM
220229
default n
221230

222231
config PKG_CHERRYUSB_HOST_VIDEO
@@ -239,13 +248,15 @@ if PKG_USING_CHERRYUSB
239248
prompt "Enable usb asix driver"
240249
select RT_USING_LWIP
241250
select RT_USING_LWIP212
251+
select CONFIG_USBHOST_PLATFORM_ASIX
242252
default n
243253

244254
config PKG_CHERRYUSB_HOST_RTL8152
245255
bool
246256
prompt "Enable usb rtl8152 driver"
247257
select RT_USING_LWIP
248258
select RT_USING_LWIP212
259+
select CONFIG_USBHOST_PLATFORM_RTL8152
249260
default n
250261

251262
config PKG_CHERRYUSB_HOST_FTDI
@@ -268,6 +279,21 @@ if PKG_USING_CHERRYUSB
268279
prompt "Enable usb pl2303 driver"
269280
default n
270281

282+
config CONFIG_USBHOST_PLATFORM_CDC_ECM
283+
bool
284+
285+
config CONFIG_USBHOST_PLATFORM_CDC_RNDIS
286+
bool
287+
288+
config CONFIG_USBHOST_PLATFORM_CDC_NCM
289+
bool
290+
291+
config CONFIG_USBHOST_PLATFORM_ASIX
292+
bool
293+
294+
config CONFIG_USBHOST_PLATFORM_RTL8152
295+
bool
296+
271297
config PKG_CHERRYUSB_HOST_TEMPLATE
272298
bool
273299
prompt "Use usb host template"
@@ -284,36 +310,6 @@ if PKG_USING_CHERRYUSB
284310
prompt "demo for test hid"
285311
default 0
286312
depends on PKG_CHERRYUSB_HOST_HID
287-
config TEST_USBH_MSC
288-
int
289-
prompt "demo for test msc, do not enable because it has used dfs instead"
290-
default 0
291-
depends on PKG_CHERRYUSB_HOST_MSC
292-
config TEST_USBH_CDC_ECM
293-
int
294-
prompt "demo for test cdc ecm"
295-
default 0
296-
depends on PKG_CHERRYUSB_HOST_CDC_ECM
297-
config TEST_USBH_CDC_NCM
298-
int
299-
prompt "demo for test cdc ncm"
300-
default 0
301-
depends on PKG_CHERRYUSB_HOST_CDC_NCM
302-
config TEST_USBH_CDC_RNDIS
303-
int
304-
prompt "demo for test cdc rndis"
305-
default 0
306-
depends on PKG_CHERRYUSB_HOST_CDC_RNDIS
307-
config TEST_USBH_ASIX
308-
int
309-
prompt "demo for test asix"
310-
default 0
311-
depends on PKG_CHERRYUSB_HOST_ASIX
312-
config TEST_USBH_RTL8152
313-
int
314-
prompt "demo for test rtl8152"
315-
default 0
316-
depends on PKG_CHERRYUSB_HOST_RTL8152
317313
endif
318314
endif
319315

@@ -323,12 +319,14 @@ if PKG_USING_CHERRYUSB
323319

324320
choice
325321
prompt "Version"
326-
default PKG_USING_CHERRYUSB_V010300
322+
default PKG_USING_CHERRYUSB_V010301
327323
help
328324
Select the package version
329325

330326
config PKG_USING_CHERRYUSB_LATEST_VERSION
331327
bool "latest"
328+
config PKG_USING_CHERRYUSB_V010301
329+
bool "v1.3.1"
332330
config PKG_USING_CHERRYUSB_V010300
333331
bool "v1.3.0"
334332
config PKG_USING_CHERRYUSB_V010200
@@ -340,6 +338,7 @@ if PKG_USING_CHERRYUSB
340338
config PKG_CHERRYUSB_VER
341339
string
342340
default "latest" if PKG_USING_CHERRYUSB_LATEST_VERSION
341+
default "v1.3.1" if PKG_USING_CHERRYUSB_V010301
343342
default "v1.3.0" if PKG_USING_CHERRYUSB_V010300
344343
default "v1.2.0" if PKG_USING_CHERRYUSB_V010200
345344
default "v0.10.2" if PKG_USING_CHERRYUSB_V001002

‎system/CherryUSB/package.json

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
"filename": "Null for git package",
2626
"VER_SHA": "master"
2727
},
28+
{
29+
"version": "v1.3.1",
30+
"URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.3.1.zip",
31+
"filename": "CherryUSB-1.3.1.zip"
32+
},
2833
{
2934
"version": "v1.3.0",
3035
"URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.3.0.zip",

0 commit comments

Comments
 (0)