From 50f041f5c2fb69b06283f54ce4619a08751d9367 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 30 May 2022 18:04:05 -0400 Subject: [Scons] 将GCC判断条件改为列表方式，方便后续增加新的编译工具链 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/stm32/libraries/templates/stm32f0xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32f10x/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32f2xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32f3xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32f4xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32f7xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32h7xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32l1xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32l4xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32l5xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript | 2 +- bsp/stm32/libraries/templates/stm32wbxx/board/SConscript | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'bsp/stm32/libraries') diff --git a/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript index de50dc8411..50fcde0e20 100644 --- a/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript @@ -17,7 +17,7 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc/startup_stm32f091xc.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/arm/startup_stm32f091xc.s'] diff --git a/bsp/stm32/libraries/templates/stm32f10x/board/SConscript b/bsp/stm32/libraries/templates/stm32f10x/board/SConscript index e3f1843360..6447a4f5f1 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f10x/board/SConscript @@ -17,7 +17,7 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xb.s'] diff --git a/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript index 4ee71bf9dc..0e53faa663 100644 --- a/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript @@ -17,7 +17,7 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f207xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/arm/startup_stm32f207xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript index cbbf9b91de..ca933f3454 100644 --- a/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript @@ -17,7 +17,7 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/gcc/startup_stm32f302x8.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/arm/startup_stm32f302x8.s'] diff --git a/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript index fd34090efc..d478107655 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript @@ -17,7 +17,7 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript index c543f16503..a4779a0031 100644 --- a/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript @@ -14,7 +14,7 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript b/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript index ab03805d74..13c724edf1 100644 --- a/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript @@ -14,7 +14,7 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript index f014eadec6..61c7bee0dc 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript @@ -21,7 +21,7 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32L151xb.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/arm/startup_stm32L151xb.s'] diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript index d042d99c95..e1554e6a03 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript @@ -17,7 +17,7 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l475xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l475xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript index 46b55262c1..dc08f2c36a 100644 --- a/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript @@ -17,7 +17,7 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/gcc/startup_stm32l552xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/arm/startup_stm32l552xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript b/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript index 0e748d6d56..01d19e3442 100644 --- a/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript @@ -33,7 +33,7 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/gcc/startup_stm32mp15xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/arm/startup_stm32mp15xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript b/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript index 69fc966ade..65341cea42 100644 --- a/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript @@ -18,7 +18,7 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb55xx_cm4.s'] -- cgit v1.3.1