Skip to content

update(cherryusb): update to v1.3.1 #1746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2024
Merged

update(cherryusb): update to v1.3.1 #1746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 38 additions & 39 deletions system/CherryUSB/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@ if PKG_USING_CHERRYUSB
bool "dwc2_at"
config PKG_CHERRYUSB_DEVICE_DWC2_GD
bool "dwc2_gd"
config PKG_CHERRYUSB_DEVICE_DWC2_HC
bool "dwc2_hc"
config PKG_CHERRYUSB_DEVICE_DWC2_CUSTOM
bool "dwc2_custom"
config PKG_CHERRYUSB_DEVICE_MUSB_STANDARD
bool "musb_standard"
config PKG_CHERRYUSB_DEVICE_MUSB_ES
bool "musb_es"
config PKG_CHERRYUSB_DEVICE_MUSB_SUNXI
bool "musb_sunxi"
config PKG_CHERRYUSB_DEVICE_MUSB_BK
bool "musb_bk"
config PKG_CHERRYUSB_DEVICE_MUSB_CUSTOM
bool "musb_custom"
config PKG_CHERRYUSB_DEVICE_BL
Expand Down Expand Up @@ -170,10 +174,12 @@ if PKG_USING_CHERRYUSB
bool "dwc2_esp"
config PKG_CHERRYUSB_HOST_DWC2_CUSTOM
bool "dwc2_custom"
config PKG_CHERRYUSB_HOST_MUSB_STANDARD
bool "musb_standard"
config PKG_CHERRYUSB_HOST_MUSB_ES
bool "musb_es"
config PKG_CHERRYUSB_HOST_MUSB_SUNXI
bool "musb_sunxi"
config PKG_CHERRYUSB_HOST_MUSB_BK
bool "musb_bk"
config PKG_CHERRYUSB_HOST_MUSB_CUSTOM
bool "musb_custom"
config PKG_CHERRYUSB_HOST_PUSB2
Expand All @@ -198,25 +204,28 @@ if PKG_USING_CHERRYUSB
default n
select RT_USING_DFS

config PKG_CHERRYUSB_HOST_CDC_RNDIS
config PKG_CHERRYUSB_HOST_CDC_ECM
bool
prompt "Enable usb rndis driver"
prompt "Enable usb cdc ecm driver"
select RT_USING_LWIP
select RT_USING_LWIP212
select CONFIG_USBHOST_PLATFORM_CDC_ECM
default n

config PKG_CHERRYUSB_HOST_CDC_ECM
config PKG_CHERRYUSB_HOST_CDC_RNDIS
bool
prompt "Enable usb cdc ecm driver"
prompt "Enable usb rndis driver"
select RT_USING_LWIP
select RT_USING_LWIP212
select CONFIG_USBHOST_PLATFORM_CDC_RNDIS
default n

config PKG_CHERRYUSB_HOST_CDC_NCM
bool
prompt "Enable usb cdc ncm driver"
select RT_USING_LWIP
select RT_USING_LWIP212
select CONFIG_USBHOST_PLATFORM_CDC_NCM
default n

config PKG_CHERRYUSB_HOST_VIDEO
Expand All @@ -239,13 +248,15 @@ if PKG_USING_CHERRYUSB
prompt "Enable usb asix driver"
select RT_USING_LWIP
select RT_USING_LWIP212
select CONFIG_USBHOST_PLATFORM_ASIX
default n

config PKG_CHERRYUSB_HOST_RTL8152
bool
prompt "Enable usb rtl8152 driver"
select RT_USING_LWIP
select RT_USING_LWIP212
select CONFIG_USBHOST_PLATFORM_RTL8152
default n

config PKG_CHERRYUSB_HOST_FTDI
Expand All @@ -268,6 +279,21 @@ if PKG_USING_CHERRYUSB
prompt "Enable usb pl2303 driver"
default n

config CONFIG_USBHOST_PLATFORM_CDC_ECM
bool

config CONFIG_USBHOST_PLATFORM_CDC_RNDIS
bool

config CONFIG_USBHOST_PLATFORM_CDC_NCM
bool

config CONFIG_USBHOST_PLATFORM_ASIX
bool

config CONFIG_USBHOST_PLATFORM_RTL8152
bool

config PKG_CHERRYUSB_HOST_TEMPLATE
bool
prompt "Use usb host template"
Expand All @@ -284,36 +310,6 @@ if PKG_USING_CHERRYUSB
prompt "demo for test hid"
default 0
depends on PKG_CHERRYUSB_HOST_HID
config TEST_USBH_MSC
int
prompt "demo for test msc, do not enable because it has used dfs instead"
default 0
depends on PKG_CHERRYUSB_HOST_MSC
config TEST_USBH_CDC_ECM
int
prompt "demo for test cdc ecm"
default 0
depends on PKG_CHERRYUSB_HOST_CDC_ECM
config TEST_USBH_CDC_NCM
int
prompt "demo for test cdc ncm"
default 0
depends on PKG_CHERRYUSB_HOST_CDC_NCM
config TEST_USBH_CDC_RNDIS
int
prompt "demo for test cdc rndis"
default 0
depends on PKG_CHERRYUSB_HOST_CDC_RNDIS
config TEST_USBH_ASIX
int
prompt "demo for test asix"
default 0
depends on PKG_CHERRYUSB_HOST_ASIX
config TEST_USBH_RTL8152
int
prompt "demo for test rtl8152"
default 0
depends on PKG_CHERRYUSB_HOST_RTL8152
endif
endif

Expand All @@ -323,12 +319,14 @@ if PKG_USING_CHERRYUSB

choice
prompt "Version"
default PKG_USING_CHERRYUSB_V010300
default PKG_USING_CHERRYUSB_V010301
help
Select the package version

config PKG_USING_CHERRYUSB_LATEST_VERSION
bool "latest"
config PKG_USING_CHERRYUSB_V010301
bool "v1.3.1"
config PKG_USING_CHERRYUSB_V010300
bool "v1.3.0"
config PKG_USING_CHERRYUSB_V010200
Expand All @@ -340,6 +338,7 @@ if PKG_USING_CHERRYUSB
config PKG_CHERRYUSB_VER
string
default "latest" if PKG_USING_CHERRYUSB_LATEST_VERSION
default "v1.3.1" if PKG_USING_CHERRYUSB_V010301
default "v1.3.0" if PKG_USING_CHERRYUSB_V010300
default "v1.2.0" if PKG_USING_CHERRYUSB_V010200
default "v0.10.2" if PKG_USING_CHERRYUSB_V001002
Expand Down
5 changes: 5 additions & 0 deletions system/CherryUSB/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
"filename": "Null for git package",
"VER_SHA": "master"
},
{
"version": "v1.3.1",
"URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.3.1.zip",
"filename": "CherryUSB-1.3.1.zip"
},
{
"version": "v1.3.0",
"URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.3.0.zip",
Expand Down
Loading