Skip to content

Commit 302fa51

Browse files
GuozhanxinGuozhanxin
authored
Merge pull request #5572 from charlown/master
2 parents 658b2c1 + e969e71 commit 302fa51

File tree

6 files changed

+254
-118
lines changed

6 files changed

+254
-118
lines changed

‎.github/workflows/action.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ jobs:
144144
- {RTT_BSP: "stm32/stm32mp157a-st-ev1", RTT_TOOL_CHAIN: "sourcery-arm"}
145145
- {RTT_BSP: "stm32/stm32u575-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
146146
- {RTT_BSP: "stm32/stm32wb55-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
147+
- {RTT_BSP: "wch/arm/ch32f103c8-core", RTT_TOOL_CHAIN: "sourcery-arm"}
148+
- {RTT_BSP: "wch/arm/ch32f203r-evt", RTT_TOOL_CHAIN: "sourcery-arm"}
147149
- {RTT_BSP: "swm320", RTT_TOOL_CHAIN: "sourcery-arm"}
148150
- {RTT_BSP: "swm320-lq100", RTT_TOOL_CHAIN: "sourcery-arm"}
149151
- {RTT_BSP: "beaglebone", RTT_TOOL_CHAIN: "sourcery-arm"}

bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/CMSIS/WCH/CH32F20x/Source/GCC/startup_ch32f10x.S renamed to bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/CMSIS/WCH/CH32F20x/Source/GCC/startup_ch32f20x.S

Lines changed: 181 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/********************************** (C) COPYRIGHT *******************************
2-
* File Name : startup_ch32f10x.s
2+
* File Name : startup_ch32f20x.s
33
* Author : WCH
44
* Version : V1.0.0
55
* Date : 2020/11/01
6-
* Description : CH32F10x vector table for GCC toolchain.
6+
* Description : CH32F20x vector table for GCC toolchain.
77
*******************************************************************************/
88

99
.syntax unified
@@ -148,7 +148,51 @@ g_pfnVectors:
148148
.word EXTI15_10_IRQHandler
149149
.word RTCAlarm_IRQHandler
150150
.word USBWakeUp_IRQHandler
151-
.word USBHD_IRQHandler
151+
.word TIM8_BRK_IRQHandler
152+
.word TIM8_UP_IRQHandler
153+
.word TIM8_TRG_COM_IRQHandler
154+
.word TIM8_CC_IRQHandler
155+
.word RNG_IRQHandler
156+
.word FSMC_IRQHandler
157+
.word SDIO_IRQHandler
158+
.word TIM5_IRQHandler
159+
.word SPI3_IRQHandler
160+
.word UART4_IRQHandler
161+
.word UART5_IRQHandler
162+
.word TIM6_IRQHandler
163+
.word TIM7_IRQHandler
164+
.word DMA2_Channel1_IRQHandler
165+
.word DMA2_Channel2_IRQHandler
166+
.word DMA2_Channel3_IRQHandler
167+
.word DMA2_Channel4_IRQHandler
168+
.word DMA2_Channel5_IRQHandler
169+
.word ETH_IRQHandler
170+
.word ETH_WKUP_IRQHandler
171+
.word CAN2_TX_IRQHandler
172+
.word CAN2_RX0_IRQHandler
173+
.word CAN2_RX1_IRQHandler
174+
.word CAN2_SCE_IRQHandler
175+
.word OTG_FS_IRQHandler
176+
.word USBHSWakeup_IRQHandler
177+
.word USBHS_IRQHandler
178+
.word DVP_IRQHandler
179+
.word UART6_IRQHandler
180+
.word UART7_IRQHandler
181+
.word UART8_IRQHandler
182+
.word TIM9_BRK_IRQHandler
183+
.word TIM9_UP_IRQHandler
184+
.word TIM9_TRG_COM_IRQHandler
185+
.word TIM9_CC_IRQHandler
186+
.word TIM10_BRK_IRQHandler
187+
.word TIM10_UP_IRQHandler
188+
.word TIM10_TRG_COM_IRQHandler
189+
.word TIM10_CC_IRQHandler
190+
.word DMA2_Channel6_IRQHandler
191+
.word DMA2_Channel7_IRQHandler
192+
.word DMA2_Channel8_IRQHandler
193+
.word DMA2_Channel9_IRQHandler
194+
.word DMA2_Channel10_IRQHandler
195+
.word DMA2_Channel11_IRQHandler
152196

153197
/*******************************************************************************
154198
Dummy Exception Handlers (infinite loops which can be modified)
@@ -309,5 +353,137 @@ g_pfnVectors:
309353
.weak USBWakeUp_IRQHandler
310354
.thumb_set USBWakeUp_IRQHandler,Default_Handler
311355

312-
.weak USBHD_IRQHandler
313-
.thumb_set USBHD_IRQHandler,Default_Handler
356+
.weak TIM8_BRK_IRQHandler
357+
.thumb_set TIM8_BRK_IRQHandler,Default_Handler
358+
359+
.weak TIM8_UP_IRQHandler
360+
.thumb_set TIM8_UP_IRQHandler,Default_Handler
361+
362+
.weak TIM8_TRG_COM_IRQHandler
363+
.thumb_set TIM8_TRG_COM_IRQHandler,Default_Handler
364+
365+
.weak TIM8_CC_IRQHandler
366+
.thumb_set TIM8_CC_IRQHandler,Default_Handler
367+
368+
.weak RNG_IRQHandler
369+
.thumb_set RNG_IRQHandler,Default_Handler
370+
371+
.weak FSMC_IRQHandler
372+
.thumb_set FSMC_IRQHandler,Default_Handler
373+
374+
.weak SDIO_IRQHandler
375+
.thumb_set SDIO_IRQHandler,Default_Handler
376+
377+
.weak TIM5_IRQHandler
378+
.thumb_set TIM5_IRQHandler,Default_Handler
379+
380+
.weak SPI3_IRQHandler
381+
.thumb_set SPI3_IRQHandler,Default_Handler
382+
383+
.weak UART4_IRQHandler
384+
.thumb_set UART4_IRQHandler,Default_Handler
385+
386+
.weak UART5_IRQHandler
387+
.thumb_set UART5_IRQHandler,Default_Handler
388+
389+
.weak TIM6_IRQHandler
390+
.thumb_set TIM6_IRQHandler,Default_Handler
391+
392+
.weak TIM7_IRQHandler
393+
.thumb_set TIM7_IRQHandler,Default_Handler
394+
395+
.weak DMA2_Channel1_IRQHandler
396+
.thumb_set DMA2_Channel1_IRQHandler,Default_Handler
397+
398+
.weak DMA2_Channel2_IRQHandler
399+
.thumb_set DMA2_Channel2_IRQHandler,Default_Handler
400+
401+
.weak DMA2_Channel3_IRQHandler
402+
.thumb_set DMA2_Channel3_IRQHandler,Default_Handler
403+
404+
.weak DMA2_Channel4_IRQHandler
405+
.thumb_set DMA2_Channel4_IRQHandler,Default_Handler
406+
407+
.weak DMA2_Channel5_IRQHandler
408+
.thumb_set DMA2_Channel5_IRQHandler,Default_Handler
409+
410+
.weak ETH_IRQHandler
411+
.thumb_set ETH_IRQHandler,Default_Handler
412+
413+
.weak ETH_WKUP_IRQHandler
414+
.thumb_set ETH_WKUP_IRQHandler,Default_Handler
415+
416+
.weak CAN2_TX_IRQHandler
417+
.thumb_set CAN2_TX_IRQHandler,Default_Handler
418+
419+
.weak CAN2_RX0_IRQHandler
420+
.thumb_set CAN2_RX0_IRQHandler,Default_Handler
421+
422+
.weak CAN2_RX1_IRQHandler
423+
.thumb_set CAN2_RX1_IRQHandler,Default_Handler
424+
425+
.weak CAN2_SCE_IRQHandler
426+
.thumb_set CAN2_SCE_IRQHandler,Default_Handler
427+
428+
.weak OTG_FS_IRQHandler
429+
.thumb_set OTG_FS_IRQHandler,Default_Handler
430+
431+
.weak USBHSWakeup_IRQHandler
432+
.thumb_set USBHSWakeup_IRQHandler,Default_Handler
433+
434+
.weak USBHS_IRQHandler
435+
.thumb_set USBHS_IRQHandler,Default_Handler
436+
437+
.weak DVP_IRQHandler
438+
.thumb_set DVP_IRQHandler,Default_Handler
439+
440+
.weak UART6_IRQHandler
441+
.thumb_set UART6_IRQHandler,Default_Handler
442+
443+
.weak UART7_IRQHandler
444+
.thumb_set UART7_IRQHandler,Default_Handler
445+
446+
.weak UART8_IRQHandler
447+
.thumb_set UART8_IRQHandler,Default_Handler
448+
449+
.weak TIM9_BRK_IRQHandler
450+
.thumb_set TIM9_BRK_IRQHandler,Default_Handler
451+
452+
.weak TIM9_UP_IRQHandler
453+
.thumb_set TIM9_UP_IRQHandler,Default_Handler
454+
455+
.weak TIM9_TRG_COM_IRQHandler
456+
.thumb_set TIM9_TRG_COM_IRQHandler,Default_Handler
457+
458+
.weak TIM9_CC_IRQHandler
459+
.thumb_set TIM9_CC_IRQHandler,Default_Handler
460+
461+
.weak TIM10_BRK_IRQHandler
462+
.thumb_set TIM10_BRK_IRQHandler,Default_Handler
463+
464+
.weak TIM10_UP_IRQHandler
465+
.thumb_set TIM10_UP_IRQHandler,Default_Handler
466+
467+
.weak TIM10_TRG_COM_IRQHandler
468+
.thumb_set TIM10_TRG_COM_IRQHandler,Default_Handler
469+
470+
.weak TIM10_CC_IRQHandler
471+
.thumb_set TIM10_CC_IRQHandler,Default_Handler
472+
473+
.weak DMA2_Channel6_IRQHandler
474+
.thumb_set DMA2_Channel6_IRQHandler,Default_Handler
475+
476+
.weak DMA2_Channel7_IRQHandler
477+
.thumb_set DMA2_Channel7_IRQHandler,Default_Handler
478+
479+
.weak DMA2_Channel8_IRQHandler
480+
.thumb_set DMA2_Channel8_IRQHandler,Default_Handler
481+
482+
.weak DMA2_Channel9_IRQHandler
483+
.thumb_set DMA2_Channel9_IRQHandler,Default_Handler
484+
485+
.weak DMA2_Channel10_IRQHandler
486+
.thumb_set DMA2_Channel10_IRQHandler,Default_Handler
487+
488+
.weak DMA2_Channel11_IRQHandler
489+
.thumb_set DMA2_Channel11_IRQHandler,Default_Handler

‎bsp/wch/arm/ch32f103c8-core/.config‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -673,18 +673,13 @@ CONFIG_SOC_CH32F103C8=y
673673
# On-chip Peripheral Drivers
674674
#
675675
CONFIG_BSP_USING_UART=y
676-
CONFIG_BSP_USING_UART1=y
676+
# CONFIG_BSP_USING_UART1 is not set
677677
CONFIG_BSP_USING_UART2=y
678-
CONFIG_BSP_USING_UART3=y
679-
CONFIG_BSP_USING_SPI=y
680-
CONFIG_BSP_USING_SPI1=y
681-
CONFIG_BSP_USING_SPI2=y
682-
CONFIG_BSP_USING_HWI2C=y
683-
CONFIG_BSP_USING_HWI2C1=y
684-
CONFIG_BSP_USING_HWI2C2=y
685-
CONFIG_BSP_USING_IWDT=y
686-
CONFIG_BSP_USING_RTC=y
687-
CONFIG_BSP_USING_RTC_LSI=y
678+
# CONFIG_BSP_USING_UART3 is not set
679+
# CONFIG_BSP_USING_SPI is not set
680+
# CONFIG_BSP_USING_HWI2C is not set
681+
# CONFIG_BSP_USING_IWDT is not set
682+
# CONFIG_BSP_USING_RTC is not set
688683
CONFIG_LSI_VALUE=40000
689684
# CONFIG_BSP_USING_TIM is not set
690685

‎bsp/wch/arm/ch32f103c8-core/board/board.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ void ch32f1_i2c_config(I2C_TypeDef *i2cx)
200200
}
201201
}
202202

203+
#ifdef BSP_USING_TIM
203204
void ch32f1_tim_clock_init(TIM_TypeDef *timx)
204205
{
205206
if (timx == TIM1)
@@ -434,3 +435,4 @@ void ch32f1_pwm_io_init(TIM_TypeDef *timx, rt_uint8_t channel)
434435
}
435436
}
436437
}
438+
#endif

0 commit comments

Comments
 (0)