summaryrefslogtreecommitdiff
path: root/hw/bsp
diff options
context:
space:
mode:
authorhathach <[email protected]>2026-06-22 15:23:08 +0700
committerhathach <[email protected]>2026-06-22 15:23:08 +0700
commiteda704ca1acef9691b51e17026765f497b1fffbe (patch)
tree77d099452c42cf93a56a4441c4f915d5fcd00706 /hw/bsp
parentef63456eead840e45dc3bf632345b00d13216043 (diff)
hw/bsp+wch: rename the CH58x family to ch583 and OPT_MCU_CH58X to OPT_MCU_CH583
The BSP family and MCU option were named "ch58x"/"CH58X", but the supported part is the CH583/CH582 (and the SDK repo is openwch/ch583); CH585 is a separate MCU family, so the CH58x umbrella was misleading. Rename to the specific family: - hw/bsp/ch58x -> hw/bsp/ch583 (dir), and the BSP-local files ch58x_it.* -> ch583_it.*, system_ch58x.* -> system_ch583.* (include guards/refs updated). The vendor SDK files (CH58x_common.h, CH58x_*.c in hw/mcu/wch/ch583) keep their names. - OPT_MCU_CH58X -> OPT_MCU_CH583 in tusb_option.h, tusb_mcu.h, and the shared WCH USBFS driver (ch32_usbfs_reg.h, dcd_ch32_usbfs.c). OPT_MCU_CH582 is kept as an alias (same value), so either name selects the same code. - FAMILY_MCUS CH58X -> CH583, CFG_TUSB_MCU=OPT_MCU_CH583, mcu:CH58X -> mcu:CH583 in the example skip lists, the CI build matrix (ci_set_matrix.py), the get_deps family tag, and docs/reference/boards.rst. Board names (ch582m_evt, yd-ch582m) are unchanged. Verified: make + cmake build for ch582m_evt, and ci.lan HIL (all device examples pass). Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Diffstat (limited to 'hw/bsp')
-rw-r--r--hw/bsp/ch583/boards/ch582m_evt/board.cmake (renamed from hw/bsp/ch58x/boards/ch582m_evt/board.cmake)0
-rw-r--r--hw/bsp/ch583/boards/ch582m_evt/board.h (renamed from hw/bsp/ch58x/boards/ch582m_evt/board.h)0
-rw-r--r--hw/bsp/ch583/boards/ch582m_evt/board.mk (renamed from hw/bsp/ch58x/boards/ch582m_evt/board.mk)0
-rw-r--r--hw/bsp/ch583/boards/yd-ch582m/board.cmake (renamed from hw/bsp/ch58x/boards/yd-ch582m/board.cmake)0
-rw-r--r--hw/bsp/ch583/boards/yd-ch582m/board.h (renamed from hw/bsp/ch58x/boards/yd-ch582m/board.h)0
-rw-r--r--hw/bsp/ch583/boards/yd-ch582m/board.mk (renamed from hw/bsp/ch58x/boards/yd-ch582m/board.mk)0
-rw-r--r--hw/bsp/ch583/ch583_it.c (renamed from hw/bsp/ch58x/ch58x_it.c)2
-rw-r--r--hw/bsp/ch583/ch583_it.h (renamed from hw/bsp/ch58x/ch58x_it.h)6
-rw-r--r--hw/bsp/ch583/debug_uart.c (renamed from hw/bsp/ch58x/debug_uart.c)0
-rw-r--r--hw/bsp/ch583/debug_uart.h (renamed from hw/bsp/ch58x/debug_uart.h)0
-rw-r--r--hw/bsp/ch583/family.c (renamed from hw/bsp/ch58x/family.c)2
-rw-r--r--hw/bsp/ch583/family.cmake (renamed from hw/bsp/ch58x/family.cmake)8
-rw-r--r--hw/bsp/ch583/family.mk (renamed from hw/bsp/ch58x/family.mk)6
-rw-r--r--hw/bsp/ch583/linker/ch582.ld (renamed from hw/bsp/ch58x/linker/ch582.ld)0
-rw-r--r--hw/bsp/ch583/system_ch583.c (renamed from hw/bsp/ch58x/system_ch58x.c)2
-rw-r--r--hw/bsp/ch583/system_ch583.h (renamed from hw/bsp/ch58x/system_ch58x.h)6
-rw-r--r--hw/bsp/ch583/wch-riscv.cfg (renamed from hw/bsp/ch58x/wch-riscv.cfg)0
17 files changed, 16 insertions, 16 deletions
diff --git a/hw/bsp/ch58x/boards/ch582m_evt/board.cmake b/hw/bsp/ch583/boards/ch582m_evt/board.cmake
index 4129c4550..4129c4550 100644
--- a/hw/bsp/ch58x/boards/ch582m_evt/board.cmake
+++ b/hw/bsp/ch583/boards/ch582m_evt/board.cmake
diff --git a/hw/bsp/ch58x/boards/ch582m_evt/board.h b/hw/bsp/ch583/boards/ch582m_evt/board.h
index c3483bf17..c3483bf17 100644
--- a/hw/bsp/ch58x/boards/ch582m_evt/board.h
+++ b/hw/bsp/ch583/boards/ch582m_evt/board.h
diff --git a/hw/bsp/ch58x/boards/ch582m_evt/board.mk b/hw/bsp/ch583/boards/ch582m_evt/board.mk
index a13979799..a13979799 100644
--- a/hw/bsp/ch58x/boards/ch582m_evt/board.mk
+++ b/hw/bsp/ch583/boards/ch582m_evt/board.mk
diff --git a/hw/bsp/ch58x/boards/yd-ch582m/board.cmake b/hw/bsp/ch583/boards/yd-ch582m/board.cmake
index 4129c4550..4129c4550 100644
--- a/hw/bsp/ch58x/boards/yd-ch582m/board.cmake
+++ b/hw/bsp/ch583/boards/yd-ch582m/board.cmake
diff --git a/hw/bsp/ch58x/boards/yd-ch582m/board.h b/hw/bsp/ch583/boards/yd-ch582m/board.h
index 0da5747bc..0da5747bc 100644
--- a/hw/bsp/ch58x/boards/yd-ch582m/board.h
+++ b/hw/bsp/ch583/boards/yd-ch582m/board.h
diff --git a/hw/bsp/ch58x/boards/yd-ch582m/board.mk b/hw/bsp/ch583/boards/yd-ch582m/board.mk
index a13979799..a13979799 100644
--- a/hw/bsp/ch58x/boards/yd-ch582m/board.mk
+++ b/hw/bsp/ch583/boards/yd-ch582m/board.mk
diff --git a/hw/bsp/ch58x/ch58x_it.c b/hw/bsp/ch583/ch583_it.c
index 2211e1eda..8479c537a 100644
--- a/hw/bsp/ch58x/ch58x_it.c
+++ b/hw/bsp/ch583/ch583_it.c
@@ -24,7 +24,7 @@
* This file is part of the TinyUSB stack.
*/
-#include "ch58x_it.h"
+#include "ch583_it.h"
// NMI exception handler
__INTERRUPT __HIGH_CODE void NMI_Handler(void) {
diff --git a/hw/bsp/ch58x/ch58x_it.h b/hw/bsp/ch583/ch583_it.h
index 3e050344d..29d175403 100644
--- a/hw/bsp/ch58x/ch58x_it.h
+++ b/hw/bsp/ch583/ch583_it.h
@@ -24,8 +24,8 @@
* This file is part of the TinyUSB stack.
*/
-#ifndef CH58X_IT_H_
-#define CH58X_IT_H_
+#ifndef CH583_IT_H_
+#define CH583_IT_H_
#ifdef __cplusplus
extern "C" {
@@ -43,4 +43,4 @@ void SysTick_Handler(void);
}
#endif
-#endif /* CH58X_IT_H_ */
+#endif /* CH583_IT_H_ */
diff --git a/hw/bsp/ch58x/debug_uart.c b/hw/bsp/ch583/debug_uart.c
index 850e40718..850e40718 100644
--- a/hw/bsp/ch58x/debug_uart.c
+++ b/hw/bsp/ch583/debug_uart.c
diff --git a/hw/bsp/ch58x/debug_uart.h b/hw/bsp/ch583/debug_uart.h
index 44c3e7948..44c3e7948 100644
--- a/hw/bsp/ch58x/debug_uart.h
+++ b/hw/bsp/ch583/debug_uart.h
diff --git a/hw/bsp/ch58x/family.c b/hw/bsp/ch583/family.c
index 64ae4a903..716e2b76b 100644
--- a/hw/bsp/ch58x/family.c
+++ b/hw/bsp/ch583/family.c
@@ -41,7 +41,7 @@
#include "debug_uart.h"
#include "CH58x_common.h"
-#include "ch58x_it.h"
+#include "ch583_it.h"
#include "bsp/board_api.h"
#include "board.h"
diff --git a/hw/bsp/ch58x/family.cmake b/hw/bsp/ch583/family.cmake
index a52309276..a379298e5 100644
--- a/hw/bsp/ch58x/family.cmake
+++ b/hw/bsp/ch583/family.cmake
@@ -10,7 +10,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
set(CMAKE_SYSTEM_CPU rv32imac-ilp32 CACHE INTERNAL "System Processor")
set(CMAKE_TOOLCHAIN_FILE ${TOP}/examples/build_system/cmake/toolchain/riscv_${TOOLCHAIN}.cmake)
-set(FAMILY_MCUS CH58X CACHE INTERNAL "")
+set(FAMILY_MCUS CH583 CACHE INTERNAL "")
set(OPENOCD_OPTION "-f ${CMAKE_CURRENT_LIST_DIR}/wch-riscv.cfg")
#------------------------------------
@@ -34,8 +34,8 @@ function(family_add_board BOARD_TARGET)
${SDK_SRC_DIR}/StdPeriphDriver/CH58x_clk.c
${SDK_SRC_DIR}/StdPeriphDriver/CH58x_uart1.c
${SDK_SRC_DIR}/StdPeriphDriver/CH58x_sys.c
- ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ch58x_it.c
- ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/system_ch58x.c
+ ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/ch583_it.c
+ ${CMAKE_CURRENT_FUNCTION_LIST_DIR}/system_ch583.c
)
target_include_directories(${BOARD_TARGET} PUBLIC
${SDK_SRC_DIR}/RVMSIS
@@ -71,7 +71,7 @@ endfunction()
#------------------------------------
function(family_configure_example TARGET RTOS)
family_configure_common(${TARGET} ${RTOS})
- family_add_tinyusb(${TARGET} OPT_MCU_CH58X)
+ family_add_tinyusb(${TARGET} OPT_MCU_CH583)
target_sources(${TARGET} PUBLIC
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/family.c
diff --git a/hw/bsp/ch58x/family.mk b/hw/bsp/ch583/family.mk
index ac0443659..98d0f9337 100644
--- a/hw/bsp/ch58x/family.mk
+++ b/hw/bsp/ch583/family.mk
@@ -19,7 +19,7 @@ CFLAGS += \
-mno-save-restore \
-fmessage-length=0 \
-fsigned-char \
- -DCFG_TUSB_MCU=OPT_MCU_CH58X \
+ -DCFG_TUSB_MCU=OPT_MCU_CH583 \
-DCFG_TUD_WCH_USBIP_USBFS=1 \
-DFREQ_SYS=60000000 \
-DDISK_LIB_ENABLE=0 \
@@ -39,8 +39,8 @@ SRC_C += \
$(SDK_SRC_DIR)/StdPeriphDriver/CH58x_uart1.c \
$(SDK_SRC_DIR)/StdPeriphDriver/CH58x_sys.c \
$(FAMILY_PATH)/debug_uart.c \
- $(FAMILY_PATH)/ch58x_it.c \
- $(FAMILY_PATH)/system_ch58x.c
+ $(FAMILY_PATH)/ch583_it.c \
+ $(FAMILY_PATH)/system_ch583.c
SRC_S += \
$(SDK_SRC_DIR)/Startup/startup_CH583.S
diff --git a/hw/bsp/ch58x/linker/ch582.ld b/hw/bsp/ch583/linker/ch582.ld
index 821998a49..821998a49 100644
--- a/hw/bsp/ch58x/linker/ch582.ld
+++ b/hw/bsp/ch583/linker/ch582.ld
diff --git a/hw/bsp/ch58x/system_ch58x.c b/hw/bsp/ch583/system_ch583.c
index 068c1a131..d3724f0ce 100644
--- a/hw/bsp/ch58x/system_ch58x.c
+++ b/hw/bsp/ch583/system_ch583.c
@@ -25,7 +25,7 @@
*/
#include "CH58x_common.h"
-#include "system_ch58x.h"
+#include "system_ch583.h"
uint32_t SystemCoreClock = FREQ_SYS;
diff --git a/hw/bsp/ch58x/system_ch58x.h b/hw/bsp/ch583/system_ch583.h
index e96741ee8..c174c9f5e 100644
--- a/hw/bsp/ch58x/system_ch58x.h
+++ b/hw/bsp/ch583/system_ch583.h
@@ -24,8 +24,8 @@
* This file is part of the TinyUSB stack.
*/
-#ifndef SYSTEM_CH58X_H_
-#define SYSTEM_CH58X_H_
+#ifndef SYSTEM_CH583_H_
+#define SYSTEM_CH583_H_
#ifdef __cplusplus
extern "C" {
@@ -40,4 +40,4 @@ extern void SystemCoreClockUpdate(void);
}
#endif
-#endif /* SYSTEM_CH58X_H_ */
+#endif /* SYSTEM_CH583_H_ */
diff --git a/hw/bsp/ch58x/wch-riscv.cfg b/hw/bsp/ch583/wch-riscv.cfg
index 64d595d8e..64d595d8e 100644
--- a/hw/bsp/ch58x/wch-riscv.cfg
+++ b/hw/bsp/ch583/wch-riscv.cfg