diff --git a/system/CherryUSB/Kconfig b/system/CherryUSB/Kconfig index 42a596e864..814b3eb75f 100644 --- a/system/CherryUSB/Kconfig +++ b/system/CherryUSB/Kconfig @@ -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 @@ -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 @@ -198,18 +204,20 @@ 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 @@ -217,6 +225,7 @@ if PKG_USING_CHERRYUSB 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 @@ -239,6 +248,7 @@ 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 @@ -246,6 +256,7 @@ if PKG_USING_CHERRYUSB 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 @@ -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" @@ -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 @@ -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 @@ -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 diff --git a/system/CherryUSB/package.json b/system/CherryUSB/package.json index d72b4e1a62..d125d81c44 100644 --- a/system/CherryUSB/package.json +++ b/system/CherryUSB/package.json @@ -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",