From 2b205526d3a07aac19364f00165f491b83146d17 Mon Sep 17 00:00:00 2001 From: hathach Date: Sat, 20 Jun 2026 00:03:18 +0700 Subject: [PATCH] hw/mcu/wch: rename ch58x SDK dir to ch583 to match the openwch repo The dependency is fetched from https://github.com/openwch/ch583.git but lived at hw/mcu/wch/ch58x. Rename the local path to hw/mcu/wch/ch583 so it matches the upstream repo name. Updates the get_deps.py path key and the ch58x BSP SDK_DIR (family.mk + family.cmake); the BSP family stays "ch58x" (covers CH582 and CH583). Co-Authored-By: Claude Opus 4.8 (1M context) --- hw/bsp/ch58x/family.cmake | 2 +- hw/bsp/ch58x/family.mk | 2 +- tools/get_deps.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/bsp/ch58x/family.cmake b/hw/bsp/ch58x/family.cmake index cbe1ffe72..a52309276 100644 --- a/hw/bsp/ch58x/family.cmake +++ b/hw/bsp/ch58x/family.cmake @@ -1,6 +1,6 @@ include_guard() -set(SDK_DIR ${TOP}/hw/mcu/wch/ch58x) +set(SDK_DIR ${TOP}/hw/mcu/wch/ch583) set(SDK_SRC_DIR ${SDK_DIR}/EVT/EXAM/SRC) # include board specific diff --git a/hw/bsp/ch58x/family.mk b/hw/bsp/ch58x/family.mk index 2ef90a8c3..36ce254fc 100644 --- a/hw/bsp/ch58x/family.mk +++ b/hw/bsp/ch58x/family.mk @@ -7,7 +7,7 @@ # Toolchain from https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack CROSS_COMPILE ?= riscv-none-elf- -SDK_DIR = hw/mcu/wch/ch58x +SDK_DIR = hw/mcu/wch/ch583 SDK_SRC_DIR = $(SDK_DIR)/EVT/EXAM/SRC include $(TOP)/$(BOARD_PATH)/board.mk diff --git a/tools/get_deps.py b/tools/get_deps.py index 6d7b91a76..b31f8a0cb 100755 --- a/tools/get_deps.py +++ b/tools/get_deps.py @@ -253,7 +253,7 @@ deps_optional = { 'hw/mcu/wch/ch32f20x': ['https://github.com/openwch/ch32f20x.git', '77c4095087e5ed2c548ec9058e655d0b8757663b', 'ch32f20x'], - 'hw/mcu/wch/ch58x': ['https://github.com/openwch/ch583.git', + 'hw/mcu/wch/ch583': ['https://github.com/openwch/ch583.git', 'bd508ad7ceed48377619837051412a651952857f', 'ch58x'], 'hw/mcu/artery/at32f403a_407': ['https://github.com/ArteryTek/AT32F403A_407_Firmware_Library.git',