diff --git a/.github/workflows/ci_set_matrix.py b/.github/workflows/ci_set_matrix.py index 50ada5964..fd3649eb4 100755 --- a/.github/workflows/ci_set_matrix.py +++ b/.github/workflows/ci_set_matrix.py @@ -31,6 +31,14 @@ family_list = { "ch32v10x": ["riscv-gcc"], "ch32v20x": ["riscv-gcc"], "ch32v30x": ["riscv-gcc"], + "ch32h417": ["riscv-gcc"], + "ch569": ["riscv-gcc"], + # The WCH SuperSpeed families default to SPEED=super, which compiles their USB2 dcd out + # entirely (dcd_ch32h417_usbhs.c) or all but its dcd_* entry points (dcd_ch56x_usbhs.c). + # One SPEED=high build per family type-checks that half; --build-name keeps its metrics.json + # out of the default build's artifact path. + "-bnanoch32h417 -DSPEED=high --build-name nanoch32h417-hs": ["riscv-gcc"], + "-bhydrausb3_v1 -DSPEED=high --build-name hydrausb3_v1-hs": ["riscv-gcc"], "ch583": ["riscv-gcc"], "da1469x": ["arm-gcc"], "fomu": ["riscv-gcc"], diff --git a/docs/reference/boards.rst b/docs/reference/boards.rst index 8b0f798ba..6751c982f 100644 --- a/docs/reference/boards.rst +++ b/docs/reference/boards.rst @@ -376,6 +376,7 @@ WCH Board Name Family URL Note ================== ============================= ======== ===================================================================== ====== ch32f205r-r0 CH32F205r-r0 ch32f20x https://github.com/openwch/ch32f20x +nanoch32h417 nanoCH32H417 ch32h417 https://github.com/wuxx/nanoCH32H417 ch32v103c_bluepill CH32V103C8T6-Bluepill ch32v10x https://stm32-base.org/boards/STM32F103C8T6-Blue-Pill ch32v103r_r1_1v0 CH32V103R-R1-1v1 ch32v10x https://github.com/openwch/ch32v103/tree/main/SCHPCB/CH32V103R-R1-1v1 ch32v203c_r0_1v0 CH32V203C-R0-1v0 ch32v20x https://github.com/openwch/ch32v20x/tree/main/SCHPCB/CH32V203C-R0 @@ -383,6 +384,7 @@ ch32v203g_r0_1v0 CH32V203G-R0-1v0 ch32v20x https://github.com/ nanoch32v203 nanoCH32V203 ch32v20x https://github.com/wuxx/nanoCH32V203 ch32v307v_r1_1v0 CH32V307V-R1-1v0 ch32v30x https://github.com/openwch/ch32v307/tree/main/SCHPCB/CH32V307V-R1-1v0 nanoch32v305 nanoCH32V305 ch32v30x https://github.com/wuxx/nanoCH32V305 +hydrausb3_v1 HydraUSB3 v1 ch569 https://github.com/hydrausb3/hydrausb3_hw ch582m_evt CH582M-EVT evaluation board ch583 https://www.wch-ic.com/products/CH582.html yd-ch582m yd-ch582m from vcc-gnd studio ch583 http://vcc-gnd.com/ ================== ============================= ======== ===================================================================== ====== diff --git a/docs/reference/dependencies.rst b/docs/reference/dependencies.rst index 146192ef8..63a317e2a 100644 --- a/docs/reference/dependencies.rst +++ b/docs/reference/dependencies.rst @@ -87,9 +87,11 @@ hw/mcu/st/stm32wbaxx_hal_driver https://github.com/STMicroelectronics/ hw/mcu/st/stm32wbxx_hal_driver https://github.com/STMicroelectronics/stm32wbxx_hal_driver.git d60dd46996876506f1d2e9abd6b1cc110c8004cd stm32wb hw/mcu/ti https://github.com/hathach/ti_driver.git 083944907e7d08fcb1f614b47598ce45935b8da1 msp430 msp432e4 tm4c hw/mcu/wch/ch32f20x https://github.com/openwch/ch32f20x.git 77c4095087e5ed2c548ec9058e655d0b8757663b ch32f20x +hw/mcu/wch/ch32h417 https://github.com/openwch/ch32h417.git a0a56fa830b860297a64a72315a731b71c841329 ch32h417 hw/mcu/wch/ch32v103 https://github.com/openwch/ch32v103.git 7578cae0b21f86dd053a1f781b2fc6ab99d0ec17 ch32v10x hw/mcu/wch/ch32v20x https://github.com/openwch/ch32v20x.git c4c38f507e258a4e69b059ccc2dc27dde33cea1b ch32v20x hw/mcu/wch/ch32v307 https://github.com/openwch/ch32v307.git 184f21b852cb95eed58e86e901837bc9fff68775 ch32v30x +hw/mcu/wch/ch569 https://github.com/openwch/ch569.git 0424d2968d1f9802e91b9cc4b72bad75f82b342b ch569 hw/mcu/wch/ch583 https://github.com/openwch/ch583.git bd508ad7ceed48377619837051412a651952857f ch583 lib/CMSIS_5 https://github.com/ARM-software/CMSIS_5.git 2b7495b8535bdcb306dac29b9ded4cfb679d7e5c kinetis_k kinetis_kl lpc54 rw61x mm32 msp432e4 nrf samd2x_l2x lpc11 lpc13 lpc15 lpc17 lpc18 lpc40 lpc43 stm32c0 stm32f0 stm32f1 stm32f2 stm32f3 stm32f4 stm32f7 stm32g0 stm32g4 stm32h5 stm32h7 stm32h7rs stm32l0 stm32l1 stm32l4 stm32l5 stm32u0 stm32u5 stm32wb stm32wba sam3x samd11 samd21 samd2x_l2x samd51 samd5x_e5x same5x same7x samg tm4c lib/CMSIS_6 https://github.com/ARM-software/CMSIS_6.git 6f0a58d01aa9bd2feba212097f9afe7acd991d52 imxrt kinetis_k32l ra stm32n6 lpc51 lpc55 mcx stm32c5 diff --git a/hw/bsp/BoardPresets.json b/hw/bsp/BoardPresets.json index a480efc3e..c88cacf02 100644 --- a/hw/bsp/BoardPresets.json +++ b/hw/bsp/BoardPresets.json @@ -278,6 +278,10 @@ "name": "hpm6750evk2", "inherits": "default" }, + { + "name": "hydrausb3_v1", + "inherits": "default" + }, { "name": "itsybitsy_m0", "inherits": "default" @@ -454,6 +458,10 @@ "name": "msp_exp432e401y", "inherits": "default" }, + { + "name": "nanoch32h417", + "inherits": "default" + }, { "name": "nanoch32v203", "inherits": "default" @@ -1355,6 +1363,11 @@ "description": "Build preset for the hpm6750evk2 board", "configurePreset": "hpm6750evk2" }, + { + "name": "hydrausb3_v1", + "description": "Build preset for the hydrausb3_v1 board", + "configurePreset": "hydrausb3_v1" + }, { "name": "itsybitsy_m0", "description": "Build preset for the itsybitsy_m0 board", @@ -1575,6 +1588,11 @@ "description": "Build preset for the msp_exp432e401y board", "configurePreset": "msp_exp432e401y" }, + { + "name": "nanoch32h417", + "description": "Build preset for the nanoch32h417 board", + "configurePreset": "nanoch32h417" + }, { "name": "nanoch32v203", "description": "Build preset for the nanoch32v203 board", @@ -3159,6 +3177,19 @@ } ] }, + { + "name": "hydrausb3_v1", + "steps": [ + { + "type": "configure", + "name": "hydrausb3_v1" + }, + { + "type": "build", + "name": "hydrausb3_v1" + } + ] + }, { "name": "itsybitsy_m0", "steps": [ @@ -3731,6 +3762,19 @@ } ] }, + { + "name": "nanoch32h417", + "steps": [ + { + "type": "configure", + "name": "nanoch32h417" + }, + { + "type": "build", + "name": "nanoch32h417" + } + ] + }, { "name": "nanoch32v203", "steps": [ diff --git a/tools/get_deps.py b/tools/get_deps.py index baaf3761f..cf6063299 100755 --- a/tools/get_deps.py +++ b/tools/get_deps.py @@ -262,6 +262,12 @@ deps_optional = { 'hw/mcu/wch/ch32f20x': ['https://github.com/openwch/ch32f20x.git', '77c4095087e5ed2c548ec9058e655d0b8757663b', 'ch32f20x'], + 'hw/mcu/wch/ch32h417': ['https://github.com/openwch/ch32h417.git', + 'a0a56fa830b860297a64a72315a731b71c841329', + 'ch32h417'], + 'hw/mcu/wch/ch569': ['https://github.com/openwch/ch569.git', + '0424d2968d1f9802e91b9cc4b72bad75f82b342b', + 'ch569'], 'hw/mcu/wch/ch583': ['https://github.com/openwch/ch583.git', 'bd508ad7ceed48377619837051412a651952857f', 'ch583'],