From b734026d5cc8c74f97aeae4288284588fdc2f919 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Tue, 29 Oct 2019 16:27:02 +0800 Subject: [PATCH] [update] g0 series bsp --- bsp/stm32/libraries/STM32G0xx_HAL/SConscript | 4 ++-- bsp/stm32/stm32g071-st-nucleo/board/SConscript | 6 +++--- bsp/stm32/stm32g071-st-nucleo/project.ewp | 11 ++++------- bsp/stm32/stm32g071-st-nucleo/project.uvprojx | 13 +++---------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/bsp/stm32/libraries/STM32G0xx_HAL/SConscript b/bsp/stm32/libraries/STM32G0xx_HAL/SConscript index 53c05b7160..934239833d 100644 --- a/bsp/stm32/libraries/STM32G0xx_HAL/SConscript +++ b/bsp/stm32/libraries/STM32G0xx_HAL/SConscript @@ -6,7 +6,7 @@ from building import * cwd = GetCurrentDir() src = Split(""" -CMSIS/ST/STM32G0xx/Source/Templates/system_stm32g0xx.c +CMSIS/Device/ST/STM32G0xx/Source/Templates/system_stm32g0xx.c STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_cec.c STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc.c STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_rcc_ex.c @@ -51,7 +51,7 @@ if GetDepend(['RT_USING_WDT']): src += ['STM32G0xx_HAL_Driver/Src/stm32g0xx_hal_wwdg.c'] path = [cwd + '/STM32G0xx_HAL_Driver/Inc', - cwd + '/CMSIS/ST/STM32G0xx/Include', + cwd + '/CMSIS/Device/ST/STM32G0xx/Include', cwd + '/CMSIS/Include'] CPPDEFINES = ['USE_HAL_DRIVER'] diff --git a/bsp/stm32/stm32g071-st-nucleo/board/SConscript b/bsp/stm32/stm32g071-st-nucleo/board/SConscript index 640c49b52b..b5e3801062 100644 --- a/bsp/stm32/stm32g071-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g071-st-nucleo/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB if rtconfig.CROSS_TOOL == 'gcc': - src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/ST/STM32G0xx/Source/Templates/gcc/startup_stm32g071xx.s'] + src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/gcc/startup_stm32g071xx.s'] elif rtconfig.CROSS_TOOL == 'keil': - src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/ST/STM32G0xx/Source/Templates/arm/startup_stm32g071xx.s'] + src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/arm/startup_stm32g071xx.s'] elif rtconfig.CROSS_TOOL == 'iar': - src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/ST/STM32G0xx/Source/Templates/iar/startup_stm32g071xx.s'] + src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/iar/startup_stm32g071xx.s'] CPPDEFINES = ['STM32G071xx'] group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) diff --git a/bsp/stm32/stm32g071-st-nucleo/project.ewp b/bsp/stm32/stm32g071-st-nucleo/project.ewp index 9dffa2b5d7..dbc1848d29 100644 --- a/bsp/stm32/stm32g071-st-nucleo/project.ewp +++ b/bsp/stm32/stm32g071-st-nucleo/project.ewp @@ -354,12 +354,12 @@ $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0 $PROJ_DIR$\..\..\..\components\finsh $PROJ_DIR$\..\..\..\libcpu\arm\common - $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Include $PROJ_DIR$\..\..\..\components\drivers\include $PROJ_DIR$\..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Inc $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config + $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Include $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Include @@ -1406,12 +1406,12 @@ $PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0 $PROJ_DIR$\..\..\..\components\finsh $PROJ_DIR$\..\..\..\libcpu\arm\common - $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Include $PROJ_DIR$\..\..\..\components\drivers\include $PROJ_DIR$\..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Inc $PROJ_DIR$\. $PROJ_DIR$\applications $PROJ_DIR$\..\libraries\HAL_Drivers\config + $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Include $PROJ_DIR$\board $PROJ_DIR$\..\..\..\components\libc\compilers\common $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Include @@ -2112,9 +2112,6 @@ $PROJ_DIR$\..\..\..\src\components.c - - $PROJ_DIR$\..\..\..\src\cpu.c - $PROJ_DIR$\..\..\..\src\device.c @@ -2167,7 +2164,7 @@ $PROJ_DIR$\board\CubeMX_Config\Src\stm32g0xx_hal_msp.c - $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\iar\startup_stm32g071xx.s + $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\iar\startup_stm32g071xx.s $PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c @@ -2275,7 +2272,7 @@ STM32_HAL - $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c + $PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c $PROJ_DIR$\..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Src\stm32g0xx_hal_cec.c diff --git a/bsp/stm32/stm32g071-st-nucleo/project.uvprojx b/bsp/stm32/stm32g071-st-nucleo/project.uvprojx index 967e6ca416..b3b2698075 100644 --- a/bsp/stm32/stm32g071-st-nucleo/project.uvprojx +++ b/bsp/stm32/stm32g071-st-nucleo/project.uvprojx @@ -334,7 +334,7 @@ USE_HAL_DRIVER, STM32G071xx - .;..\..\..\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 + .;..\..\..\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 @@ -391,13 +391,6 @@ ..\..\..\src\components.c - - - cpu.c - 1 - ..\..\..\src\cpu.c - - device.c @@ -513,7 +506,7 @@ startup_stm32g071xx.s 2 - ..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\arm\startup_stm32g071xx.s + ..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\arm\startup_stm32g071xx.s @@ -742,7 +735,7 @@ system_stm32g0xx.c 1 - ..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c + ..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c -- GitLab