diff --git a/system/CherryUSB/Kconfig b/system/CherryUSB/Kconfig index a058b78d3a..73d5f3b2b4 100644 --- a/system/CherryUSB/Kconfig +++ b/system/CherryUSB/Kconfig @@ -13,12 +13,12 @@ if PKG_USING_CHERRYUSB if PKG_CHERRYUSB_DEVICE choice prompt "Select usb device speed" - default PKG_CHERRYUSB_DEVICE_FS - config PKG_CHERRYUSB_DEVICE_FS + default PKG_CHERRYUSB_DEVICE_SPEED_FS + config PKG_CHERRYUSB_DEVICE_SPEED_FS bool "FS" - config PKG_CHERRYUSB_DEVICE_HS + config PKG_CHERRYUSB_DEVICE_SPEED_HS bool "HS" - config PKG_CHERRYUSB_DEVICE_AUTO + config PKG_CHERRYUSB_DEVICE_SPEED_AUTO bool "AUTO" endchoice @@ -27,20 +27,24 @@ if PKG_USING_CHERRYUSB default PKG_CHERRYUSB_DEVICE_CUSTOM config PKG_CHERRYUSB_DEVICE_CUSTOM bool "CUSTOM (Implement it yourself)" - config PKG_CHERRYUSB_DEVICE_FSDEV - bool "fsdev" + config PKG_CHERRYUSB_DEVICE_FSDEV_ST + bool "fsdev_st" + config PKG_CHERRYUSB_DEVICE_FSDEV_CUSTOM + bool "fsdev_custom" config PKG_CHERRYUSB_DEVICE_DWC2_ST bool "dwc2_st" config PKG_CHERRYUSB_DEVICE_DWC2_ESP bool "dwc2_esp" + config PKG_CHERRYUSB_DEVICE_DWC2_KENDRYTE + bool "dwc2_kendryte" config PKG_CHERRYUSB_DEVICE_DWC2_AT 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_KENDRYTE - bool "dwc2_kendryte" + config PKG_CHERRYUSB_DEVICE_DWC2_NATION + bool "dwc2_nation" + config PKG_CHERRYUSB_DEVICE_DWC2_GD + bool "dwc2_gd" config PKG_CHERRYUSB_DEVICE_DWC2_CUSTOM bool "dwc2_custom" config PKG_CHERRYUSB_DEVICE_MUSB_ES @@ -51,16 +55,16 @@ if PKG_USING_CHERRYUSB bool "musb_bk" config PKG_CHERRYUSB_DEVICE_MUSB_CUSTOM bool "musb_custom" + config PKG_CHERRYUSB_DEVICE_CHIPIDEA_MCX + bool "chipidea_mcx" + config PKG_CHERRYUSB_DEVICE_CHIPIDEA_CUSTOM + bool "chipidea_custom" config PKG_CHERRYUSB_DEVICE_KINETIS_MCX bool "kinetis_mcx" config PKG_CHERRYUSB_DEVICE_KINETIS_MM32 bool "kinetis_mm32" config PKG_CHERRYUSB_DEVICE_KINETIS_CUSTOM bool "kinetis_custom" - config PKG_CHERRYUSB_DEVICE_CHIPIDEA_MCX - bool "chipidea_mcx" - config PKG_CHERRYUSB_DEVICE_CHIPIDEA_CUSTOM - bool "chipidea_custom" config PKG_CHERRYUSB_DEVICE_BL bool "bouffalo" config PKG_CHERRYUSB_DEVICE_HPM @@ -115,6 +119,11 @@ if PKG_USING_CHERRYUSB prompt "Enable usb cdc ncm device" default n + config PKG_CHERRYUSB_DEVICE_MTP + bool + prompt "Enable usb mtp device, it is commercial charge" + default n + config PKG_CHERRYUSB_DEVICE_DFU bool prompt "Enable usb dfu device" @@ -128,7 +137,9 @@ if PKG_USING_CHERRYUSB config PKG_CHERRYUSB_DEVICE_TEMPLATE_CDC_ACM bool "cdc_acm" config PKG_CHERRYUSB_DEVICE_TEMPLATE_MSC - bool "msc" + bool "msc_ram" + config PKG_CHERRYUSB_DEVICE_TEMPLATE_MSC_BLKDEV + bool "msc_blkdev" config PKG_CHERRYUSB_DEVICE_TEMPLATE_HID_KEYBOARD bool "hid_keyboard" config PKG_CHERRYUSB_DEVICE_TEMPLATE_HID_MOUSE @@ -159,6 +170,11 @@ if PKG_USING_CHERRYUSB bool "winusbv2_hid" endchoice + config CONFIG_USBDEV_MSC_BLOCK_DEV_NAME + string "usb device msc block device name" + depends on PKG_CHERRYUSB_DEVICE_TEMPLATE_MSC_BLKDEV + default "sd0" + endif menuconfig PKG_CHERRYUSB_HOST @@ -189,10 +205,12 @@ if PKG_USING_CHERRYUSB bool "dwc2_st" config PKG_CHERRYUSB_HOST_DWC2_ESP bool "dwc2_esp" - config PKG_CHERRYUSB_HOST_DWC2_HC - bool "dwc2_hc" config PKG_CHERRYUSB_HOST_DWC2_KENDRYTE bool "dwc2_kendryte" + config PKG_CHERRYUSB_HOST_DWC2_HC + bool "dwc2_hc" + config PKG_CHERRYUSB_HOST_DWC2_NATION + bool "dwc2_nation" config PKG_CHERRYUSB_HOST_DWC2_CUSTOM bool "dwc2_custom" config PKG_CHERRYUSB_HOST_MUSB_ES @@ -207,12 +225,6 @@ if PKG_USING_CHERRYUSB bool "pusb2" config PKG_CHERRYUSB_HOST_XHCI bool "xhci" - config PKG_CHERRYUSB_HOST_KINETIS_MCX - bool "kinetis_mcx" - config PKG_CHERRYUSB_HOST_KINETIS_MM32 - bool "kinetis_mm32" - config PKG_CHERRYUSB_HOST_KINETIS_CUSTOM - bool "kinetis_custom" config PKG_CHERRYUSB_HOST_RP2040 bool "rp2040" endchoice @@ -232,6 +244,7 @@ if PKG_USING_CHERRYUSB prompt "Enable usb msc driver" default n select RT_USING_DFS + select RT_USING_DFS_ELMFAT config PKG_CHERRYUSB_HOST_CDC_ECM bool @@ -318,6 +331,16 @@ if PKG_USING_CHERRYUSB config CONFIG_USBHOST_PLATFORM_RTL8152 bool + config RT_LWIP_PBUF_POOL_BUFSIZE + int "The size of each pbuf in the pbuf pool" + range 1500 2000 + default 1600 + + config CONFIG_USB_DFS_MOUNT_POINT + string "usb host dfs mount point" + depends on RT_CHERRYUSB_HOST_MSC + default "/" + config PKG_CHERRYUSB_HOST_TEMPLATE bool prompt "Use usb host template" @@ -343,12 +366,14 @@ if PKG_USING_CHERRYUSB choice prompt "Version" - default PKG_USING_CHERRYUSB_V010403 + default PKG_USING_CHERRYUSB_V010500 help Select the package version config PKG_USING_CHERRYUSB_LATEST_VERSION bool "latest" + config PKG_USING_CHERRYUSB_V010500 + bool "v1.5.0" config PKG_USING_CHERRYUSB_V010403 bool "v1.4.3" config PKG_USING_CHERRYUSB_V010402 @@ -368,6 +393,7 @@ if PKG_USING_CHERRYUSB config PKG_CHERRYUSB_VER string default "latest" if PKG_USING_CHERRYUSB_LATEST_VERSION + default "v1.5.0" if PKG_USING_CHERRYUSB_V010500 default "v1.4.3" if PKG_USING_CHERRYUSB_V010403 default "v1.4.2" if PKG_USING_CHERRYUSB_V010402 default "v1.4.0" if PKG_USING_CHERRYUSB_V010400 diff --git a/system/CherryUSB/package.json b/system/CherryUSB/package.json index 27eba80467..aa2ba80c84 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.5.0", + "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.5.0.zip", + "filename": "CherryUSB-1.5.0.zip" + }, { "version": "v1.4.3", "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v1.4.3.zip",