From 89343caed2d8dfb32485f9ed92bfdad3afa81793 Mon Sep 17 00:00:00 2001 From: zhugengyu Date: Wed, 15 Nov 2023 15:37:04 +0800 Subject: [PATCH 1/5] [system][cherryusb] add new port --- system/CherryUSB/Kconfig | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/system/CherryUSB/Kconfig b/system/CherryUSB/Kconfig index af7c1ac40b..9cdc948f9f 100644 --- a/system/CherryUSB/Kconfig +++ b/system/CherryUSB/Kconfig @@ -39,6 +39,8 @@ if PKG_USING_CHERRYUSB bool "MUSB" config PKG_CHERRYUSB_DEVICE_HPM bool "HPM" + config PKG_CHERRYUSB_DEVICE_PUSB2 + bool "PUSB2" endchoice if PKG_CHERRYUSB_DEVICE_CH32 @@ -130,6 +132,11 @@ if PKG_USING_CHERRYUSB bool prompt "Use msc ram template" default n + + config PKG_CHERRYUSB_DEVICE_MSC_STORAGE_TEMPLATE + bool + prompt "Usb msc storage template" + default n endif menuconfig PKG_CHERRYUSB_DEVICE_AUDIO @@ -204,6 +211,8 @@ if PKG_USING_CHERRYUSB bool "EHCI" config PKG_CHERRYUSB_HOST_XHCI bool "XHCI" + config PKG_CHERRYUSB_HOST_PUSB2 + bool "PUSB2" endchoice if PKG_CHERRYUSB_HOST_MUSB From fd201bc17012a2e4d4eb43b6f8d39f031491a526 Mon Sep 17 00:00:00 2001 From: Supper Thomas <78900636@qq.com> Date: Thu, 16 Nov 2023 09:20:01 +0800 Subject: [PATCH 2/5] remove the missing repo --- iot/iot_cloud/Kconfig | 2 +- system/CherryUSB/package.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/iot/iot_cloud/Kconfig b/iot/iot_cloud/Kconfig index a018d7c37d..4b2a1b3b27 100644 --- a/iot/iot_cloud/Kconfig +++ b/iot/iot_cloud/Kconfig @@ -8,7 +8,7 @@ source "$PKGS_DIR/packages/iot/iot_cloud/tencent-iot-sdk/Kconfig" source "$PKGS_DIR/packages/iot/iot_cloud/jiot-c-sdk/Kconfig" source "$PKGS_DIR/packages/iot/iot_cloud/ucloud_iot_sdk/Kconfig" source "$PKGS_DIR/packages/iot/iot_cloud/joylink/Kconfig" -source "$PKGS_DIR/packages/iot/iot_cloud/ez_iot_os/Kconfig" +#source "$PKGS_DIR/packages/iot/iot_cloud/ez_iot_os/Kconfig" #missing repo source "$PKGS_DIR/packages/iot/iot_cloud/iotsharp-c-sdk/Kconfig" endmenu diff --git a/system/CherryUSB/package.json b/system/CherryUSB/package.json index 7bfcee4163..688b20883a 100644 --- a/system/CherryUSB/package.json +++ b/system/CherryUSB/package.json @@ -25,5 +25,10 @@ "filename": "Null for git package", "VER_SHA": "master" } + { + "version": "v0.10.2", + "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v0.10.2.zip", + "filename": "CherryUSB-0.10.2.zip" + } ] } From ed498a54bd9a862f30113b4bfbea32a91a5e9b92 Mon Sep 17 00:00:00 2001 From: zhugengyu Date: Thu, 16 Nov 2023 16:52:57 +0800 Subject: [PATCH 3/5] update package.json --- system/CherryUSB/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/CherryUSB/package.json b/system/CherryUSB/package.json index 688b20883a..3368d795ef 100644 --- a/system/CherryUSB/package.json +++ b/system/CherryUSB/package.json @@ -24,7 +24,7 @@ "URL": "https://github.com/sakumisu/CherryUSB.git", "filename": "Null for git package", "VER_SHA": "master" - } + }, { "version": "v0.10.2", "URL": "https://github.com/cherry-embedded/CherryUSB/archive/refs/tags/v0.10.2.zip", From 8d5919b7deb5217d14b125c70f1ee4aa54d85b9d Mon Sep 17 00:00:00 2001 From: zhugengyu <85654684+zhugengyu@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:54:14 +0800 Subject: [PATCH 4/5] Rename package.json to package.json.missing --- iot/iot_cloud/ez_iot_os/{package.json => package.json.missing} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename iot/iot_cloud/ez_iot_os/{package.json => package.json.missing} (100%) diff --git a/iot/iot_cloud/ez_iot_os/package.json b/iot/iot_cloud/ez_iot_os/package.json.missing similarity index 100% rename from iot/iot_cloud/ez_iot_os/package.json rename to iot/iot_cloud/ez_iot_os/package.json.missing From 1ba47f31e4236de36ea9cf7a51a5d326a69f3303 Mon Sep 17 00:00:00 2001 From: zhugengyu <85654684+zhugengyu@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:57:55 +0800 Subject: [PATCH 5/5] add config for cherryusb --- system/CherryUSB/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/system/CherryUSB/Kconfig b/system/CherryUSB/Kconfig index 9cdc948f9f..f24b857151 100644 --- a/system/CherryUSB/Kconfig +++ b/system/CherryUSB/Kconfig @@ -287,10 +287,13 @@ if PKG_USING_CHERRYUSB config PKG_USING_CHERRYUSB_LATEST_VERSION bool "latest" + + config PKG_USING_CHERRYUSB_V01002 + bool "v0.10.2" endchoice config PKG_CHERRYUSB_VER string default "latest" if PKG_USING_CHERRYUSB_LATEST_VERSION - + default "v0.10.2" if PKG_USING_CHERRYUSB_V01002 endif