Skip to content

Commit e2a8d78

Browse files
committed
Move system_ file into bsp
1 parent 7da4523 commit e2a8d78

4 files changed

Lines changed: 823 additions & 7 deletions

File tree

hw/bsp/ch32h41x/family.cmake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ include_guard()
33
set(CH32_FAMILY ch32h417)
44
set(SDK_DIR ${TOP}/hw/mcu/wch/${CH32_FAMILY})
55
set(SDK_SRC_DIR ${SDK_DIR}/EVT/EXAM/SRC)
6-
set(SDK_SYSTEM_DIR ${SDK_DIR}/EVT/EXAM/USBHS/DEVICE/SimulateCDC/V3F/User)
76

87
# include board specific
98
include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
@@ -38,14 +37,13 @@ function(family_add_board BOARD_TARGET)
3837
${SDK_SRC_DIR}/Peripheral/src/${CH32_FAMILY}_flash.c
3938
${SDK_SRC_DIR}/Peripheral/src/${CH32_FAMILY}_gpio.c
4039
${SDK_SRC_DIR}/Peripheral/src/${CH32_FAMILY}_rcc.c
41-
${SDK_SYSTEM_DIR}/system_${CH32_FAMILY}.c
40+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/system_${CH32_FAMILY}.c
4241
)
4342
target_include_directories(${BOARD_TARGET} PUBLIC
4443
${SDK_SRC_DIR}/Core
4544
${SDK_SRC_DIR}/Peripheral/inc
4645
${CMAKE_CURRENT_FUNCTION_LIST_DIR}
4746
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}
48-
${SDK_SYSTEM_DIR}
4947
)
5048
target_compile_definitions(${BOARD_TARGET} PUBLIC
5149
CFG_TUD_WCH_USBIP_USBHS=1
@@ -83,7 +81,6 @@ function(family_configure_example TARGET RTOS)
8381
${CMAKE_CURRENT_FUNCTION_LIST_DIR}
8482
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../../
8583
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/boards/${BOARD}
86-
${SDK_SYSTEM_DIR}
8784
)
8885

8986
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")

hw/bsp/ch32h41x/family.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ CROSS_COMPILE ?= riscv-none-elf-
44
CH32_FAMILY = ch32h417
55
SDK_DIR = hw/mcu/wch/$(CH32_FAMILY)
66
SDK_SRC_DIR = $(SDK_DIR)/EVT/EXAM/SRC
7-
SDK_SYSTEM_DIR = $(SDK_DIR)/EVT/EXAM/USBHS/DEVICE/SimulateCDC/V3F/User
87

98
include $(TOP)/$(BOARD_PATH)/board.mk
109

@@ -35,7 +34,7 @@ SRC_C += \
3534
$(SDK_SRC_DIR)/Peripheral/src/$(CH32_FAMILY)_flash.c \
3635
$(SDK_SRC_DIR)/Peripheral/src/$(CH32_FAMILY)_gpio.c \
3736
$(SDK_SRC_DIR)/Peripheral/src/$(CH32_FAMILY)_rcc.c \
38-
$(SDK_SYSTEM_DIR)/system_$(CH32_FAMILY).c \
37+
$(FAMILY_PATH)/system_$(CH32_FAMILY).c \
3938

4039
SRC_S += \
4140
$(SDK_SRC_DIR)/Startup/startup_$(CH32_FAMILY)_v3f.S \
@@ -45,7 +44,6 @@ INC += \
4544
$(TOP)/$(SDK_SRC_DIR)/Peripheral/inc \
4645
$(TOP)/$(FAMILY_PATH) \
4746
$(TOP)/$(BOARD_PATH) \
48-
$(TOP)/$(SDK_SYSTEM_DIR) \
4947

5048
LD_FILE ?= $(SDK_SRC_DIR)/Ld/V3F/Link_v3f.ld
5149

0 commit comments

Comments
 (0)