Skip to content

Commit 9837c71

Browse files
committed
bsp: ch58x: sync cmake options with make and skip unsupported examples
1 parent d27ea05 commit 9837c71

7 files changed

Lines changed: 13 additions & 4 deletions

File tree

examples/device/audio_4_channel_mic_freertos/skip.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
mcu:CH32V103
22
mcu:CH32V20X
33
mcu:CH32V307
4+
mcu:CH58X
45
mcu:CXD56
56
mcu:F1C100S
67
mcu:GD32VF103

examples/device/audio_test_freertos/skip.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
mcu:CH32V103
22
mcu:CH32V20X
33
mcu:CH32V307
4+
mcu:CH58X
45
mcu:CXD56
56
mcu:F1C100S
67
mcu:GD32VF103

examples/device/cdc_msc_freertos/skip.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
mcu:CH32V103
22
mcu:CH32V20X
33
mcu:CH32V307
4+
mcu:CH58X
45
mcu:CXD56
56
mcu:F1C100S
67
mcu:GD32VF103

examples/device/hid_composite_freertos/skip.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
mcu:CH32V103
22
mcu:CH32V20X
33
mcu:CH32V307
4+
mcu:CH58X
45
mcu:CXD56
56
mcu:F1C100S
67
mcu:GD32VF103

examples/device/midi_test_freertos/skip.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
mcu:CH32V103
22
mcu:CH32V20X
33
mcu:CH32V307
4+
mcu:CH58X
45
mcu:CXD56
56
mcu:F1C100S
67
mcu:GD32VF103

examples/device/video_capture_2ch/skip.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ mcu:GD32VF103
55
mcu:CH32V103
66
mcu:CH32V20X
77
mcu:CH32V307
8+
mcu:CH58X
89
mcu:STM32L0
910
family:espressif
1011
board:curiosity_nano

hw/bsp/ch58x/family.cmake

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,20 @@ function(family_add_board BOARD_TARGET)
4545
target_compile_definitions(${BOARD_TARGET} PUBLIC
4646
CFG_TUD_WCH_USBIP_USBFS=1
4747
FREQ_SYS=60000000
48+
DISK_LIB_ENABLE=0
49+
INT_SOFT
4850
)
4951

5052
update_board(${BOARD_TARGET})
5153

5254
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
5355
target_compile_options(${BOARD_TARGET} PUBLIC
54-
-msmall-data-limit=8
56+
-flto
57+
-msmall-data-limit=16
5558
-mno-save-restore
5659
-fmessage-length=0
5760
-fsigned-char
61+
-Wno-error=strict-prototypes
5862
)
5963
endif ()
6064
endfunction()
@@ -82,8 +86,8 @@ function(family_configure_example TARGET RTOS)
8286

8387
if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
8488
target_link_options(${TARGET} PUBLIC
85-
-nostartfiles
86-
--specs=nosys.specs --specs=nano.specs
89+
-nostdlib -nostartfiles
90+
--specs=nosys.specs
8791
-Wl,--defsym=__FLASH_SIZE=${LD_FLASH_SIZE}
8892
-Wl,--defsym=__RAM_SIZE=${LD_RAM_SIZE}
8993
"LINKER:--script=${LD_FILE_GNU}"
@@ -99,5 +103,4 @@ function(family_configure_example TARGET RTOS)
99103
# Flashing
100104
family_add_bin_hex(${TARGET})
101105
family_flash_openocd_wch(${TARGET})
102-
family_flash_wlink_rs(${TARGET})
103106
endfunction()

0 commit comments

Comments
 (0)