Skip to content

Commit 5d9afcb

Browse files
committed
[bsp][wch]fix: ch32v307v-r1 build
1 parent 930667e commit 5d9afcb

File tree

3 files changed

+196
-24
lines changed

3 files changed

+196
-24
lines changed

bsp/wch/risc-v/ch32v307v-r1/.config

Lines changed: 128 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,112 @@
22
#
33
# RT-Thread Kernel
44
#
5+
6+
#
7+
# klibc options
8+
#
9+
10+
#
11+
# rt_vsnprintf options
12+
#
13+
# CONFIG_RT_KLIBC_USING_LIBC_VSNPRINTF is not set
14+
# CONFIG_RT_KLIBC_USING_VSNPRINTF_LONGLONG is not set
15+
# CONFIG_RT_KLIBC_USING_VSNPRINTF_STANDARD is not set
16+
# end of rt_vsnprintf options
17+
18+
#
19+
# rt_vsscanf options
20+
#
21+
# CONFIG_RT_KLIBC_USING_LIBC_VSSCANF is not set
22+
# end of rt_vsscanf options
23+
24+
#
25+
# rt_memset options
26+
#
27+
# CONFIG_RT_KLIBC_USING_USER_MEMSET is not set
28+
# CONFIG_RT_KLIBC_USING_LIBC_MEMSET is not set
29+
# CONFIG_RT_KLIBC_USING_TINY_MEMSET is not set
30+
# end of rt_memset options
31+
32+
#
33+
# rt_memcpy options
34+
#
35+
# CONFIG_RT_KLIBC_USING_USER_MEMCPY is not set
36+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCPY is not set
37+
# CONFIG_RT_KLIBC_USING_TINY_MEMCPY is not set
38+
# end of rt_memcpy options
39+
40+
#
41+
# rt_memmove options
42+
#
43+
# CONFIG_RT_KLIBC_USING_USER_MEMMOVE is not set
44+
# CONFIG_RT_KLIBC_USING_LIBC_MEMMOVE is not set
45+
# end of rt_memmove options
46+
47+
#
48+
# rt_memcmp options
49+
#
50+
# CONFIG_RT_KLIBC_USING_USER_MEMCMP is not set
51+
# CONFIG_RT_KLIBC_USING_LIBC_MEMCMP is not set
52+
# end of rt_memcmp options
53+
54+
#
55+
# rt_strstr options
56+
#
57+
# CONFIG_RT_KLIBC_USING_USER_STRSTR is not set
58+
# CONFIG_RT_KLIBC_USING_LIBC_STRSTR is not set
59+
# end of rt_strstr options
60+
61+
#
62+
# rt_strcasecmp options
63+
#
64+
# CONFIG_RT_KLIBC_USING_USER_STRCASECMP is not set
65+
# end of rt_strcasecmp options
66+
67+
#
68+
# rt_strncpy options
69+
#
70+
# CONFIG_RT_KLIBC_USING_USER_STRNCPY is not set
71+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCPY is not set
72+
# end of rt_strncpy options
73+
74+
#
75+
# rt_strcpy options
76+
#
77+
# CONFIG_RT_KLIBC_USING_USER_STRCPY is not set
78+
# CONFIG_RT_KLIBC_USING_LIBC_STRCPY is not set
79+
# end of rt_strcpy options
80+
81+
#
82+
# rt_strncmp options
83+
#
84+
# CONFIG_RT_KLIBC_USING_USER_STRNCMP is not set
85+
# CONFIG_RT_KLIBC_USING_LIBC_STRNCMP is not set
86+
# end of rt_strncmp options
87+
88+
#
89+
# rt_strcmp options
90+
#
91+
# CONFIG_RT_KLIBC_USING_USER_STRCMP is not set
92+
# CONFIG_RT_KLIBC_USING_LIBC_STRCMP is not set
93+
# end of rt_strcmp options
94+
95+
#
96+
# rt_strlen options
97+
#
98+
# CONFIG_RT_KLIBC_USING_USER_STRLEN is not set
99+
# CONFIG_RT_KLIBC_USING_LIBC_STRLEN is not set
100+
# end of rt_strlen options
101+
102+
#
103+
# rt_strnlen options
104+
#
105+
# CONFIG_RT_KLIBC_USING_USER_STRNLEN is not set
106+
# end of rt_strnlen options
107+
108+
# CONFIG_RT_UTEST_TC_USING_KLIBC is not set
109+
# end of klibc options
110+
5111
CONFIG_RT_NAME_MAX=8
6112
# CONFIG_RT_USING_ARCH_DATA_TYPE is not set
7113
# CONFIG_RT_USING_NANO is not set
@@ -14,6 +120,7 @@ CONFIG_RT_THREAD_PRIORITY_32=y
14120
# CONFIG_RT_THREAD_PRIORITY_256 is not set
15121
CONFIG_RT_THREAD_PRIORITY_MAX=32
16122
CONFIG_RT_TICK_PER_SECOND=1000
123+
# CONFIG_RT_USING_OVERFLOW_CHECK is not set
17124
CONFIG_RT_USING_HOOK=y
18125
CONFIG_RT_HOOK_USING_FUNC_PTR=y
19126
# CONFIG_RT_USING_HOOKLIST is not set
@@ -27,25 +134,17 @@ CONFIG_RT_TIMER_THREAD_STACK_SIZE=512
27134
# CONFIG_RT_USING_CPU_USAGE_TRACER is not set
28135

29136
#
30-
# kservice optimization
137+
# kservice options
31138
#
32139
# CONFIG_RT_USING_TINY_FFS is not set
33-
# end of kservice optimization
34-
35-
#
36-
# klibc optimization
37-
#
38-
# CONFIG_RT_KLIBC_USING_STDLIB is not set
39-
# CONFIG_RT_KLIBC_USING_TINY_SIZE is not set
40-
# CONFIG_RT_KLIBC_USING_PRINTF_LONGLONG is not set
41-
# end of klibc optimization
140+
# end of kservice options
42141

43142
CONFIG_RT_USING_DEBUG=y
44143
CONFIG_RT_DEBUGING_ASSERT=y
45144
CONFIG_RT_DEBUGING_COLOR=y
46145
CONFIG_RT_DEBUGING_CONTEXT=y
47146
# CONFIG_RT_DEBUGING_AUTO_INIT is not set
48-
# CONFIG_RT_USING_OVERFLOW_CHECK is not set
147+
# CONFIG_RT_USING_CI_ACTION is not set
49148

50149
#
51150
# Inter-Thread communication
@@ -80,7 +179,6 @@ CONFIG_RT_USING_DEVICE=y
80179
# CONFIG_RT_USING_DEVICE_OPS is not set
81180
# CONFIG_RT_USING_INTERRUPT_INFO is not set
82181
# CONFIG_RT_USING_THREADSAFE_PRINTF is not set
83-
# CONFIG_RT_USING_SCHED_THREAD_CTX is not set
84182
CONFIG_RT_USING_CONSOLE=y
85183
CONFIG_RT_CONSOLEBUF_SIZE=128
86184
CONFIG_RT_CONSOLE_DEVICE_NAME="uart1"
@@ -138,10 +236,12 @@ CONFIG_RT_USING_SERIAL_V1=y
138236
# CONFIG_RT_USING_SERIAL_V2 is not set
139237
# CONFIG_RT_SERIAL_USING_DMA is not set
140238
CONFIG_RT_SERIAL_RB_BUFSZ=64
239+
# CONFIG_RT_USING_SERIAL_BYPASS is not set
141240
# CONFIG_RT_USING_CAN is not set
142241
# CONFIG_RT_USING_CPUTIME is not set
143242
# CONFIG_RT_USING_I2C is not set
144243
# CONFIG_RT_USING_PHY is not set
244+
# CONFIG_RT_USING_PHY_V2 is not set
145245
# CONFIG_RT_USING_ADC is not set
146246
# CONFIG_RT_USING_DAC is not set
147247
# CONFIG_RT_USING_NULL is not set
@@ -163,6 +263,7 @@ CONFIG_RT_SERIAL_RB_BUFSZ=64
163263
# CONFIG_RT_USING_LCD is not set
164264
# CONFIG_RT_USING_HWCRYPTO is not set
165265
# CONFIG_RT_USING_WIFI is not set
266+
# CONFIG_RT_USING_BLK is not set
166267
# CONFIG_RT_USING_VIRTIO is not set
167268
CONFIG_RT_USING_PIN=y
168269
# CONFIG_RT_USING_KTIME is not set
@@ -659,6 +760,21 @@ CONFIG_RT_LIBC_TZ_DEFAULT_SEC=0
659760
# CONFIG_PKG_USING_NRFX is not set
660761
# CONFIG_PKG_USING_NUCLEI_SDK is not set
661762
# CONFIG_PKG_USING_RASPBERRYPI_PICO_SDK is not set
763+
764+
#
765+
# WCH HAL & SDK Drivers
766+
#
767+
CONFIG_PKG_USING_CH32V307_SDK=y
768+
CONFIG_PKG_CH32V307_SDK_PATH="/packages/peripherals/hal-sdk/wch/ch32v307_sdk"
769+
CONFIG_PKG_USING_CH32V307_SDK_V207=y
770+
# CONFIG_PKG_USING_CH32V307_SDK_LATEST_VERSION is not set
771+
CONFIG_PKG_CH32V307_SDK_VER="v2.7"
772+
CONFIG_PKG_USING_CH32V307_SDK_RTT_PATCH=y
773+
CONFIG_PKG_CH32V307_SDK_RTT_PATCH_PATH="/packages/peripherals/hal-sdk/wch/ch32v307_sdk_rtt_patch"
774+
CONFIG_PKG_USING_CH32V307_SDK_RTT_PATCH_V207=y
775+
# CONFIG_PKG_USING_CH32V307_SDK_RTT_PATCH_LATEST_VERSION is not set
776+
CONFIG_PKG_CH32V307_SDK_RTT_PATCH_VER="v2.7"
777+
# end of WCH HAL & SDK Drivers
662778
# end of HAL & SDK Drivers
663779

664780
#

bsp/wch/risc-v/ch32v307v-r1/SConstruct

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,9 @@ Export('SDK_LIB')
4949
# prepare building environment
5050
objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False)
5151

52-
ch32_library = 'ch32v30x_libraries'
53-
rtconfig.BSP_LIBRARY_TYPE = ch32_library
54-
5552
bsp_vdir = 'build'
5653
library_vdir = 'build/libraries'
5754

58-
# include libraries
59-
objs.extend(SConscript(os.path.join(libraries_path_prefix, ch32_library, 'SConscript'), variant_dir=library_vdir + '/ch32_library', duplicate=0))
60-
6155
# common include drivers
6256
objs.extend(SConscript(os.path.join(libraries_path_prefix, 'ch32_drivers', 'SConscript'), variant_dir=library_vdir + '/ch32_drivers', duplicate=0))
6357

bsp/wch/risc-v/ch32v307v-r1/rtconfig.h

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,64 @@
33

44
/* RT-Thread Kernel */
55

6+
/* klibc options */
7+
8+
/* rt_vsnprintf options */
9+
10+
/* end of rt_vsnprintf options */
11+
12+
/* rt_vsscanf options */
13+
14+
/* end of rt_vsscanf options */
15+
16+
/* rt_memset options */
17+
18+
/* end of rt_memset options */
19+
20+
/* rt_memcpy options */
21+
22+
/* end of rt_memcpy options */
23+
24+
/* rt_memmove options */
25+
26+
/* end of rt_memmove options */
27+
28+
/* rt_memcmp options */
29+
30+
/* end of rt_memcmp options */
31+
32+
/* rt_strstr options */
33+
34+
/* end of rt_strstr options */
35+
36+
/* rt_strcasecmp options */
37+
38+
/* end of rt_strcasecmp options */
39+
40+
/* rt_strncpy options */
41+
42+
/* end of rt_strncpy options */
43+
44+
/* rt_strcpy options */
45+
46+
/* end of rt_strcpy options */
47+
48+
/* rt_strncmp options */
49+
50+
/* end of rt_strncmp options */
51+
52+
/* rt_strcmp options */
53+
54+
/* end of rt_strcmp options */
55+
56+
/* rt_strlen options */
57+
58+
/* end of rt_strlen options */
59+
60+
/* rt_strnlen options */
61+
62+
/* end of rt_strnlen options */
63+
/* end of klibc options */
664
#define RT_NAME_MAX 8
765
#define RT_CPUS_NR 1
866
#define RT_ALIGN_SIZE 8
@@ -18,13 +76,9 @@
1876
#define RT_TIMER_THREAD_PRIO 4
1977
#define RT_TIMER_THREAD_STACK_SIZE 512
2078

21-
/* kservice optimization */
79+
/* kservice options */
2280

23-
/* end of kservice optimization */
24-
25-
/* klibc optimization */
26-
27-
/* end of klibc optimization */
81+
/* end of kservice options */
2882
#define RT_USING_DEBUG
2983
#define RT_DEBUGING_ASSERT
3084
#define RT_DEBUGING_COLOR
@@ -233,6 +287,14 @@
233287
/* Kendryte SDK */
234288

235289
/* end of Kendryte SDK */
290+
291+
/* WCH HAL & SDK Drivers */
292+
293+
#define PKG_USING_CH32V307_SDK
294+
#define PKG_USING_CH32V307_SDK_V207
295+
#define PKG_USING_CH32V307_SDK_RTT_PATCH
296+
#define PKG_USING_CH32V307_SDK_RTT_PATCH_V207
297+
/* end of WCH HAL & SDK Drivers */
236298
/* end of HAL & SDK Drivers */
237299

238300
/* sensors drivers */

0 commit comments

Comments
 (0)