[update] g0 series bsp

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 @@
           <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>

           <state>$PROJ_DIR$\..\..\..\components\finsh</state>

           <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>

-          <state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Include</state>

           <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>

           <state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Inc</state>

           <state>$PROJ_DIR$\.</state>

           <state>$PROJ_DIR$\applications</state>

           <state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>

+          <state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Include</state>

           <state>$PROJ_DIR$\board</state>

           <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>

           <state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Include</state>

@@ -1406,12 +1406,12 @@
           <state>$PROJ_DIR$\..\..\..\libcpu\arm\cortex-m0</state>

           <state>$PROJ_DIR$\..\..\..\components\finsh</state>

           <state>$PROJ_DIR$\..\..\..\libcpu\arm\common</state>

-          <state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Include</state>

           <state>$PROJ_DIR$\..\..\..\components\drivers\include</state>

           <state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Inc</state>

           <state>$PROJ_DIR$\.</state>

           <state>$PROJ_DIR$\applications</state>

           <state>$PROJ_DIR$\..\libraries\HAL_Drivers\config</state>

+          <state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Include</state>

           <state>$PROJ_DIR$\board</state>

           <state>$PROJ_DIR$\..\..\..\components\libc\compilers\common</state>

           <state>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Include</state>

@@ -2113,9 +2113,6 @@
       <name>$PROJ_DIR$\..\..\..\src\components.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\..\..\src\cpu.c</name>

-    </file>

-    <file>

       <name>$PROJ_DIR$\..\..\..\src\device.c</name>

     </file>

     <file>

@@ -2167,7 +2164,7 @@
       <name>$PROJ_DIR$\board\CubeMX_Config\Src\stm32g0xx_hal_msp.c</name>

     </file>

     <file>

-      <name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\iar\startup_stm32g071xx.s</name>

+      <name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\iar\startup_stm32g071xx.s</name>

     </file>

     <file>

       <name>$PROJ_DIR$\..\libraries\HAL_Drivers\drv_gpio.c</name>

@@ -2275,7 +2272,7 @@
   <group>

     <name>STM32_HAL</name>

     <file>

-      <name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c</name>

+      <name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c</name>

     </file>

     <file>

       <name>$PROJ_DIR$\..\libraries\STM32G0xx_HAL\STM32G0xx_HAL_Driver\Src\stm32g0xx_hal_cec.c</name>

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 @@
               <MiscControls />
               <Define>USE_HAL_DRIVER, STM32G071xx</Define>
               <Undefine />
-              <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>
+              <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>
             </VariousControls>
           </Cads>
           <Aads>
@@ -393,13 +393,6 @@
           </Files>
           <Files>
             <File>
-              <FileName>cpu.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\src\cpu.c</FilePath>
-            </File>
-          </Files>
-          <Files>
-            <File>
               <FileName>device.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\..\..\src\device.c</FilePath>
@@ -513,7 +506,7 @@
             <File>
               <FileName>startup_stm32g071xx.s</FileName>
               <FileType>2</FileType>
-              <FilePath>..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\arm\startup_stm32g071xx.s</FilePath>
+              <FilePath>..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\arm\startup_stm32g071xx.s</FilePath>
             </File>
           </Files>
           <Files>
@@ -742,7 +735,7 @@
             <File>
               <FileName>system_stm32g0xx.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\libraries\STM32G0xx_HAL\CMSIS\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c</FilePath>
+              <FilePath>..\libraries\STM32G0xx_HAL\CMSIS\Device\ST\STM32G0xx\Source\Templates\system_stm32g0xx.c</FilePath>
             </File>
           </Files>
           <Files>