Skip to content

Commit b734026

Browse files
SummerGiftSummerGift
committed
[update] g0 series bsp
1 parent 60f0f47 commit b734026

File tree

4 files changed

+12
-22
lines changed

4 files changed

+12
-22
lines changed

‎bsp/stm32/libraries/STM32G0xx_HAL/SConscript‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ from building import *
66
cwd = GetCurrentDir()
77

88
src = Split("""
9-
CMSIS/ST/STM32G0xx/Source/Templates/system_stm32g0xx.c
9+
CMSIS/Device/ST/STM32G0xx/Source/Templates/system_stm32g0xx.c
1010
STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_cec.c
1111
STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc.c
1212
STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc_ex.c
@@ -51,7 +51,7 @@ if GetDepend(['RT_USING_WDT']):
5151
src += ['STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_wwdg.c']
5252

5353
path = [cwd + '/STM32G0xx_HAL_Driver/Inc',
54-
cwd + '/CMSIS/ST/STM32G0xx/Include',
54+
cwd + '/CMSIS/Device/ST/STM32G0xx/Include',
5555
cwd + '/CMSIS/Include']
5656

5757
CPPDEFINES = ['USE_HAL_DRIVER']

‎bsp/stm32/stm32g071-st-nucleo/board/SConscript‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ path += [cwd + '/CubeMX_Config/Inc']
1818
startup_path_prefix = SDK_LIB
1919

2020
if rtconfig.CROSS_TOOL == 'gcc':
21-
src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/ST/STM32G0xx/Source/Templates/gcc/startup_stm32g071xx.s']
21+
src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/gcc/startup_stm32g071xx.s']
2222
elif rtconfig.CROSS_TOOL == 'keil':
23-
src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/ST/STM32G0xx/Source/Templates/arm/startup_stm32g071xx.s']
23+
src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/arm/startup_stm32g071xx.s']
2424
elif rtconfig.CROSS_TOOL == 'iar':
25-
src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/ST/STM32G0xx/Source/Templates/iar/startup_stm32g071xx.s']
25+
src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/iar/startup_stm32g071xx.s']
2626

2727
CPPDEFINES = ['STM32G071xx']
2828
group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)

‎bsp/stm32/stm32g071-st-nucleo/project.ewp‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,12 @@
354354
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
355355
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
356356
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
357-
<state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Include</state>
358357
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
359358
<state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Inc</state>
360359
<state>$PROJ_DIR$\.</state>
361360
<state>$PROJ_DIR$\applications</state>
362361
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>
362+
<state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Include</state>
363363
<state>$PROJ_DIR$\board</state>
364364
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
365365
<state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Include</state>
@@ -1406,12 +1406,12 @@
14061406
<state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>
14071407
<state>$PROJ_DIR$\..\..\..\components\finsh</state>
14081408
<state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>
1409-
<state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Include</state>
14101409
<state>$PROJ_DIR$\..\..\..\components\drivers\include</state>
14111410
<state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Inc</state>
14121411
<state>$PROJ_DIR$\.</state>
14131412
<state>$PROJ_DIR$\applications</state>
14141413
<state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>
1414+
<state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Include</state>
14151415
<state>$PROJ_DIR$\board</state>
14161416
<state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>
14171417
<state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Include</state>
@@ -2112,9 +2112,6 @@
21122112
<file>
21132113
<name>$PROJ_DIR$\..\..\..\src\components.c</name>
21142114
</file>
2115-
<file>
2116-
<name>$PROJ_DIR$\..\..\..\src\cpu.c</name>
2117-
</file>
21182115
<file>
21192116
<name>$PROJ_DIR$\..\..\..\src\device.c</name>
21202117
</file>
@@ -2167,7 +2164,7 @@
21672164
<name>$PROJ_DIR$\board\CubeMX_Config\Src\stm32g0xx_hal_msp.c</name>
21682165
</file>
21692166
<file>
2170-
<name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\iar\startup_stm32g071xx.s</name>
2167+
<name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\iar\startup_stm32g071xx.s</name>
21712168
</file>
21722169
<file>
21732170
<name>$PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c</name>
@@ -2275,7 +2272,7 @@
22752272
<group>
22762273
<name>STM32_HAL</name>
22772274
<file>
2278-
<name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c</name>
2275+
<name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c</name>
22792276
</file>
22802277
<file>
22812278
<name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Src\stm32g0xx_hal_cec.c</name>

‎bsp/stm32/stm32g071-st-nucleo/project.uvprojx‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
<MiscControls />
335335
<Define>USE_HAL_DRIVER, STM32G071xx</Define>
336336
<Undefine />
337-
<IncludePath>.;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Inc;..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Include;..\libraries\STM32G0xx_HAL\CMSIS\Include</IncludePath>
337+
<IncludePath>.;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m0;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\..\..\components\libc\compilers\common;..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Inc;..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Include;..\libraries\STM32G0xx_HAL\CMSIS\Include</IncludePath>
338338
</VariousControls>
339339
</Cads>
340340
<Aads>
@@ -391,13 +391,6 @@
391391
<FilePath>..\..\..\src\components.c</FilePath>
392392
</File>
393393
</Files>
394-
<Files>
395-
<File>
396-
<FileName>cpu.c</FileName>
397-
<FileType>1</FileType>
398-
<FilePath>..\..\..\src\cpu.c</FilePath>
399-
</File>
400-
</Files>
401394
<Files>
402395
<File>
403396
<FileName>device.c</FileName>
@@ -513,7 +506,7 @@
513506
<File>
514507
<FileName>startup_stm32g071xx.s</FileName>
515508
<FileType>2</FileType>
516-
<FilePath>..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\arm\startup_stm32g071xx.s</FilePath>
509+
<FilePath>..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\arm\startup_stm32g071xx.s</FilePath>
517510
</File>
518511
</Files>
519512
<Files>
@@ -742,7 +735,7 @@
742735
<File>
743736
<FileName>system_stm32g0xx.c</FileName>
744737
<FileType>1</FileType>
745-
<FilePath>..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c</FilePath>
738+
<FilePath>..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c</FilePath>
746739
</File>
747740
</Files>
748741
<Files>

0 commit comments

Comments
 (0)