Skip to content

[stm32] move CMSIS hearder files to common folder #5998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BernardXiong merged 2 commits into from
Jun 4, 2022
Merged

[stm32] move CMSIS hearder files to common folder #5998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
423e838
[stm32] move CMSIS hearder files to common folder
mysterywolf May 25, 2022
2692abb
add CMSIS new sconscript
mysterywolf May 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
0 ...STM32F0xx_HAL/CMSIS/Include/cmsis_armcc.h → ...s/HAL_Drivers/CMSIS/Include/cmsis_armcc.h
View file
Open in desktop
File renamed without changes.
0 ...32F0xx_HAL/CMSIS/Include/cmsis_armclang.h → ...AL_Drivers/CMSIS/Include/cmsis_armclang.h
View file
Open in desktop
File renamed without changes.
0 ...32F0xx_HAL/CMSIS/Include/cmsis_compiler.h → ...AL_Drivers/CMSIS/Include/cmsis_compiler.h
View file
Open in desktop
File renamed without changes.
0 ...s/STM32F0xx_HAL/CMSIS/Include/cmsis_gcc.h → ...ies/HAL_Drivers/CMSIS/Include/cmsis_gcc.h
View file
Open in desktop
File renamed without changes.
0 ...TM32F0xx_HAL/CMSIS/Include/cmsis_iccarm.h → .../HAL_Drivers/CMSIS/Include/cmsis_iccarm.h
View file
Open in desktop
File renamed without changes.
0 ...M32F0xx_HAL/CMSIS/Include/cmsis_version.h → ...HAL_Drivers/CMSIS/Include/cmsis_version.h
View file
Open in desktop
File renamed without changes.
0 ...M32F0xx_HAL/CMSIS/Include/core_armv8mbl.h → ...HAL_Drivers/CMSIS/Include/core_armv8mbl.h
View file
Open in desktop
File renamed without changes.
0 ...M32F0xx_HAL/CMSIS/Include/core_armv8mml.h → ...HAL_Drivers/CMSIS/Include/core_armv8mml.h
View file
Open in desktop
File renamed without changes.
0 ...es/STM32F0xx_HAL/CMSIS/Include/core_cm0.h → ...ries/HAL_Drivers/CMSIS/Include/core_cm0.h
View file
Open in desktop
File renamed without changes.
0 ...TM32F0xx_HAL/CMSIS/Include/core_cm0plus.h → .../HAL_Drivers/CMSIS/Include/core_cm0plus.h
View file
Open in desktop
File renamed without changes.
0 ...es/STM32F0xx_HAL/CMSIS/Include/core_cm1.h → ...ries/HAL_Drivers/CMSIS/Include/core_cm1.h
View file
Open in desktop
File renamed without changes.
0 ...s/STM32F0xx_HAL/CMSIS/Include/core_cm23.h → ...ies/HAL_Drivers/CMSIS/Include/core_cm23.h
View file
Open in desktop
File renamed without changes.
0 ...es/STM32F0xx_HAL/CMSIS/Include/core_cm3.h → ...ries/HAL_Drivers/CMSIS/Include/core_cm3.h
View file
Open in desktop
File renamed without changes.
0 ...s/STM32F0xx_HAL/CMSIS/Include/core_cm33.h → ...ies/HAL_Drivers/CMSIS/Include/core_cm33.h
View file
Open in desktop
File renamed without changes.
0 ...es/STM32F0xx_HAL/CMSIS/Include/core_cm4.h → ...ries/HAL_Drivers/CMSIS/Include/core_cm4.h
View file
Open in desktop
File renamed without changes.
0 ...es/STM32F0xx_HAL/CMSIS/Include/core_cm7.h → ...ries/HAL_Drivers/CMSIS/Include/core_cm7.h
View file
Open in desktop
File renamed without changes.
0 .../STM32F0xx_HAL/CMSIS/Include/core_sc000.h → ...es/HAL_Drivers/CMSIS/Include/core_sc000.h
View file
Open in desktop
File renamed without changes.
0 .../STM32F0xx_HAL/CMSIS/Include/core_sc300.h → ...es/HAL_Drivers/CMSIS/Include/core_sc300.h
View file
Open in desktop
File renamed without changes.
0 ...s/STM32F0xx_HAL/CMSIS/Include/mpu_armv7.h → ...ies/HAL_Drivers/CMSIS/Include/mpu_armv7.h
View file
Open in desktop
File renamed without changes.
0 ...s/STM32F0xx_HAL/CMSIS/Include/mpu_armv8.h → ...ies/HAL_Drivers/CMSIS/Include/mpu_armv8.h
View file
Open in desktop
File renamed without changes.
0 .../STM32F0xx_HAL/CMSIS/Include/tz_context.h → ...es/HAL_Drivers/CMSIS/Include/tz_context.h
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions bsp/stm32/libraries/HAL_Drivers/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ from building import *
cwd = GetCurrentDir()

# add the general drivers.
src = Split("""
""")
src = []

if GetDepend(['RT_USING_PIN']):
src += ['drv_gpio.c']
Expand Down Expand Up @@ -111,6 +110,9 @@ src += ['drv_common.c']
path = [cwd]
path += [cwd + '/config']

if not GetDepend('PKG_CMSIS_CORE'):
path += [cwd + '/CMSIS/Include']

if GetDepend('BSP_USING_ON_CHIP_FLASH'):
path += [cwd + '/drv_flash']

Expand Down
3 changes: 0 additions & 3 deletions bsp/stm32/libraries/STM32F0xx_HAL/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
path = [cwd + '/CMSIS/Device/ST/STM32F0xx/Include',
cwd + '/STM32F0xx_HAL_Driver/Inc']

if not GetDepend('PKG_CMSIS_CORE'):
path += [cwd + '/CMSIS/Include']

CPPDEFINES = ['USE_HAL_DRIVER']
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)

Expand Down
Loading