Skip to content

Commit 2692abb

Browse files
mysterywolfmysterywolf
committed
add CMSIS new sconscript
1 parent 423e838 commit 2692abb

File tree

39 files changed

+4
-53
lines changed

39 files changed

+4
-53
lines changed

‎bsp/stm32/libraries/CMSIS/Include/cmsis_armcc.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/cmsis_armcc.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/cmsis_armclang.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/cmsis_armclang.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/cmsis_compiler.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/cmsis_compiler.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/cmsis_gcc.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/cmsis_gcc.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/cmsis_iccarm.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/cmsis_iccarm.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/cmsis_version.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/cmsis_version.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_armv8mbl.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_armv8mbl.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_armv8mml.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_armv8mml.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_cm0.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_cm0.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_cm0plus.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_cm0plus.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_cm1.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_cm1.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_cm23.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_cm23.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_cm3.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_cm3.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_cm33.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_cm33.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_cm4.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_cm4.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_cm7.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_cm7.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_sc000.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_sc000.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/core_sc300.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_sc300.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/mpu_armv7.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/mpu_armv7.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/mpu_armv8.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/mpu_armv8.h

File renamed without changes.

‎bsp/stm32/libraries/CMSIS/Include/tz_context.h renamed to ‎bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/tz_context.h

File renamed without changes.

‎bsp/stm32/libraries/HAL_Drivers/SConscript

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

77
# add the general drivers.
8-
src = Split("""
9-
""")
8+
src = []
109

1110
if GetDepend(['RT_USING_PIN']):
1211
src += ['drv_gpio.c']
@@ -111,6 +110,9 @@ src += ['drv_common.c']
111110
path = [cwd]
112111
path += [cwd + '/config']
113112

113+
if not GetDepend('PKG_CMSIS_CORE'):
114+
path += [cwd + '/CMSIS/Include']
115+
114116
if GetDepend('BSP_USING_ON_CHIP_FLASH'):
115117
path += [cwd + '/drv_flash']
116118

‎bsp/stm32/libraries/STM32F0xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
7979
path = [cwd + '/CMSIS/Device/ST/STM32F0xx/Include',
8080
cwd + '/STM32F0xx_HAL_Driver/Inc']
8181

82-
if not GetDepend('PKG_CMSIS_CORE'):
83-
path += [cwd + '/CMSIS/Include']
84-
8582
CPPDEFINES = ['USE_HAL_DRIVER']
8683
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
8784

‎bsp/stm32/libraries/STM32F1xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
8585
path = [cwd + '/CMSIS/Device/ST/STM32F1xx/Include',
8686
cwd + '/STM32F1xx_HAL_Driver/Inc']
8787

88-
if not GetDepend('PKG_CMSIS_CORE'):
89-
path += [cwd + '/CMSIS/Include']
90-
9188
CPPDEFINES = ['USE_HAL_DRIVER']
9289
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
9390

‎bsp/stm32/libraries/STM32F2xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
8080
path = [cwd + '/CMSIS/Device/ST/STM32F2xx/Include',
8181
cwd + '/STM32F2xx_HAL_Driver/Inc']
8282

83-
if not GetDepend('PKG_CMSIS_CORE'):
84-
path += [cwd + '/CMSIS/Include']
85-
8683
CPPDEFINES = ['USE_HAL_DRIVER']
8784
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
8885

‎bsp/stm32/libraries/STM32F3xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
8383
path = [cwd + '/STM32F3xx_HAL_Driver/Inc',
8484
cwd + '/CMSIS/Device/ST/STM32F3xx/Include']
8585

86-
if not GetDepend('PKG_CMSIS_CORE'):
87-
path += [cwd + '/CMSIS/Include']
88-
8986
CPPDEFINES = ['USE_HAL_DRIVER']
9087
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
9188

‎bsp/stm32/libraries/STM32F4xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ if GetDepend(['BSP_USING_LTDC']):
111111
path = [cwd + '/STM32F4xx_HAL_Driver/Inc',
112112
cwd + '/CMSIS/Device/ST/STM32F4xx/Include']
113113

114-
if not GetDepend('PKG_CMSIS_CORE'):
115-
path += [cwd + '/CMSIS/Include']
116-
117114
CPPDEFINES = ['USE_HAL_DRIVER']
118115
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
119116

‎bsp/stm32/libraries/STM32F7xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ if GetDepend(['BSP_USING_LTDC']):
104104
path = [cwd + '/STM32F7xx_HAL_Driver/Inc',
105105
cwd + '/CMSIS/Device/ST/STM32F7xx/Include']
106106

107-
if not GetDepend('PKG_CMSIS_CORE'):
108-
path += [cwd + '/CMSIS/Include']
109-
110107
CPPDEFINES = ['USE_HAL_DRIVER']
111108
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
112109

‎bsp/stm32/libraries/STM32G0xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ if GetDepend(['RT_USING_RTC']):
5858
path = [cwd + '/STM32G0xx_HAL_Driver/Inc',
5959
cwd + '/CMSIS/Device/ST/STM32G0xx/Include']
6060

61-
if not GetDepend('PKG_CMSIS_CORE'):
62-
path += [cwd + '/CMSIS/Include']
63-
6461
CPPDEFINES = ['USE_HAL_DRIVER']
6562
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
6663

‎bsp/stm32/libraries/STM32G4xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ if GetDepend(['BSP_USING_LTDC']):
108108
path = [cwd + '/STM32G4xx_HAL_Driver/Inc',
109109
cwd + '/CMSIS/Device/ST/STM32G4xx/Include']
110110

111-
if not GetDepend('PKG_CMSIS_CORE'):
112-
path += [cwd + '/CMSIS/Include']
113-
114111
CPPDEFINES = ['USE_HAL_DRIVER']
115112
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
116113

‎bsp/stm32/libraries/STM32H7xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ if GetDepend(['BSP_USING_DCMI']):
110110
path = [cwd + '/STM32H7xx_HAL_Driver/Inc',
111111
cwd + '/CMSIS/Device/ST/STM32H7xx/Include']
112112

113-
if not GetDepend('PKG_CMSIS_CORE'):
114-
path += [cwd + '/CMSIS/Include']
115-
116113
CPPDEFINES = ['USE_HAL_DRIVER']
117114
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
118115

‎bsp/stm32/libraries/STM32L0xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
8686
path = [cwd + '/STM32L0xx_HAL_Driver/Inc',
8787
cwd + '/CMSIS/Device/ST/STM32L0xx/Include']
8888

89-
if not GetDepend('PKG_CMSIS_CORE'):
90-
path += [cwd + '/CMSIS/Include']
91-
9289
CPPDEFINES = ['USE_HAL_DRIVER']
9390
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
9491

‎bsp/stm32/libraries/STM32L1xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
7373
path = [cwd + '/CMSIS/Device/ST/STM32L1xx/Include',
7474
cwd + '/STM32L1xx_HAL_Driver/Inc']
7575

76-
if not GetDepend('PKG_CMSIS_CORE'):
77-
path += [cwd + '/CMSIS/Include']
78-
7976
CPPDEFINES = ['USE_HAL_DRIVER']
8077
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
8178

‎bsp/stm32/libraries/STM32L4xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ if GetDepend(['BSP_USING_SRAM']):
113113
path = [cwd + '/STM32L4xx_HAL_Driver/Inc',
114114
cwd + '/CMSIS/Device/ST/STM32L4xx/Include']
115115

116-
if not GetDepend('PKG_CMSIS_CORE'):
117-
path += [cwd + '/CMSIS/Include']
118-
119116
CPPDEFINES = ['USE_HAL_DRIVER']
120117
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
121118

‎bsp/stm32/libraries/STM32L5xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,6 @@ if GetDepend(['BSP_USING_SRAM']):
113113
path = [cwd + '/STM32L5xx_HAL_Driver/Inc',
114114
cwd + '/CMSIS/Device/ST/STM32L5xx/Include']
115115

116-
if not GetDepend('PKG_CMSIS_CORE'):
117-
path += [cwd + '/CMSIS/Include']
118-
119116
CPPDEFINES = ['USE_HAL_DRIVER']
120117
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
121118

‎bsp/stm32/libraries/STM32MPxx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@ if GetDepend(['BSP_USING_RTC']):
126126
path = [cwd + '/STM32MP1xx_HAL_Driver/Inc',
127127
cwd + '/CMSIS/Device/ST/STM32MP1xx/Include']
128128

129-
if not GetDepend('PKG_CMSIS_CORE'):
130-
path += [cwd + '/CMSIS/Include']
131-
132129
CPPDEFINES = ['USE_HAL_DRIVER']
133130
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
134131

‎bsp/stm32/libraries/STM32U5xx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ if GetDepend(['BSP_USING_SRAM']):
114114
path = [cwd + '/STM32U5xx_HAL_Driver/Inc',
115115
cwd + '/CMSIS/Device/ST/STM32U5xx/Include']
116116

117-
if not GetDepend('PKG_CMSIS_CORE'):
118-
path += [cwd + '/CMSIS/Include']
119-
120117
CPPDEFINES = ['USE_HAL_DRIVER']
121118
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
122119

‎bsp/stm32/libraries/STM32WBxx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
8080
path = [cwd + '/STM32WBxx_HAL_Driver/Inc',
8181
cwd + '/CMSIS/Device/ST/STM32WBxx/Include']
8282

83-
if not GetDepend('PKG_CMSIS_CORE'):
84-
path += [cwd + '/CMSIS/Include']
85-
8683
CPPDEFINES = ['USE_HAL_DRIVER']
8784
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
8885

‎bsp/stm32/libraries/STM32WLxx_HAL/SConscript

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ if GetDepend(['BSP_USING_SUBGHZ']):
7171
path = [cwd + '/STM32WLxx_HAL_Driver/Inc',
7272
cwd + '/CMSIS/Device/ST/STM32WLxx/Include']
7373

74-
if not GetDepend('PKG_CMSIS_CORE'):
75-
path += [cwd + '/CMSIS/Include']
76-
7774
CPPDEFINES = ['USE_HAL_DRIVER']
7875
group = DefineGroup('STM32_HAL', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
7976

0 commit comments

Comments
 (0)