Skip to content
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

[system][cherryusb] add new port for cherryusb pusb2 #1705

Merged
merged 5 commits into from
Nov 18, 2023
+19 −2
Merged

[system][cherryusb] add new port for cherryusb pusb2 #1705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89343ca
[system][cherryusb] add new port
zhugengyu Nov 15, 2023
fd201bc
remove the missing repo
supperthomas Nov 16, 2023
ed498a5
update package.json
zhugengyu Nov 16, 2023
8d5919b
Rename package.json to package.json.missing
zhugengyu Nov 16, 2023
1ba47f3
add config for cherryusb
zhugengyu Nov 16, 2023
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
2 changes: 1 addition & 1 deletion iot/iot_cloud/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
0 iot/iot_cloud/ez_iot_os/package.json → iot/iot_cloud/ez_iot_os/package.json.missing
View file
Open in desktop
File renamed without changes.
14 changes: 13 additions & 1 deletion system/CherryUSB/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -278,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
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 @@ -24,6 +24,11 @@
"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",
"filename": "CherryUSB-0.10.2.zip"
}
]
}