diff options
229 files changed, 416 insertions, 416 deletions
diff --git a/bsp/CME_M7/CMSIS/SConscript b/bsp/CME_M7/CMSIS/SConscript index 5600617e1f..5cbf1f952e 100644 --- a/bsp/CME_M7/CMSIS/SConscript +++ b/bsp/CME_M7/CMSIS/SConscript @@ -11,9 +11,9 @@ CME_M7/system_cmem7.c """) # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['CME_M7/startup/gcc/startup_CME_M7.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CME_M7/startup/arm/startup_cmem7.s'] elif rtconfig.CROSS_TOOL == 'iar': print('================ERROR============================') diff --git a/bsp/Vango/v85xx/Libraries/SConscript b/bsp/Vango/v85xx/Libraries/SConscript index 7cbb5e7d9d..18e3071c92 100644 --- a/bsp/Vango/v85xx/Libraries/SConscript +++ b/bsp/Vango/v85xx/Libraries/SConscript @@ -13,9 +13,9 @@ src += [cwd + '/CMSIS/Vango/V85xx/Source/lib_cortex.c'] src += [cwd + '/CMSIS/Vango/V85xx/Source/lib_LoadNVR.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/CMSIS/Vango/V85xx/Source/GCC/startup_target.S'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/Vango/V85xx/Source/Keil5/startup_target.S'] path = [ diff --git a/bsp/Vango/v85xxp/Libraries/SConscript b/bsp/Vango/v85xxp/Libraries/SConscript index acb3ae6670..1a3adf9287 100644 --- a/bsp/Vango/v85xxp/Libraries/SConscript +++ b/bsp/Vango/v85xxp/Libraries/SConscript @@ -13,9 +13,9 @@ src += [cwd + '/CMSIS/Vango/V85xxP/Source/lib_cortex.c'] src += [cwd + '/CMSIS/Vango/V85xxP/Source/lib_LoadNVR.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/CMSIS/Vango/V85xxP/Source/GCC/startup_target.S'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/Vango/V85xxP/Source/Keil5/startup_target.S'] path = [ diff --git a/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript b/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript index c410bca43f..5ba7ff8012 100644 --- a/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript +++ b/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript @@ -25,9 +25,9 @@ HAL_Driver/Src/HAL_CRC.c libpath = ['.', cwd + '/Device', cwd + '/HAL_Driver/Src'] libs = [] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['Device/Startup_ACM32F0x0_gcc.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['Device/Startup_ACM32F0x0.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['Device/Startup_ACM32F0x0_iar.s'] diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript b/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript index a5d24ec76e..d8d13055af 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript @@ -18,9 +18,9 @@ HAL_Driver/Src/HAL_EXTI.c libpath = ['.', cwd + '/Device', cwd + '/HAL_Driver/Src'] libs = ['System_Accelerate', 'HAL_EFlash_EX'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['Device/Startup_ACM32F4_gcc.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['Device/Startup_ACM32F4.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['Device/Startup_ACM32F4_iar.s'] diff --git a/bsp/airm2m/air105/board/SConscript b/bsp/airm2m/air105/board/SConscript index e47f1b8b09..b9745c4e6c 100644 --- a/bsp/airm2m/air105/board/SConscript +++ b/bsp/airm2m/air105/board/SConscript @@ -24,9 +24,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/HAL_Driver/Startup/gcc/startup_gcc.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/HAL_Driver/Startup/arm/startup_gcc.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/HAL_Driver/Startup/iar/startup_gcc.s'] diff --git a/bsp/amebaz/libraries/smartconfig/SConscript b/bsp/amebaz/libraries/smartconfig/SConscript index 31c98a046b..d5d29878b2 100644 --- a/bsp/amebaz/libraries/smartconfig/SConscript +++ b/bsp/amebaz/libraries/smartconfig/SConscript @@ -7,7 +7,7 @@ path = [cwd + '/inc'] libs = [''] libpath = [cwd + '/libs'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': libs += ['libsmartconfig_armcm4_gcc'] elif rtconfig.CROSS_TOOL == 'iar': libs += ['libsmartconfig_armcm4_iar'] diff --git a/bsp/apm32/apm32f103xe-minibroard/board/SConscript b/bsp/apm32/apm32f103xe-minibroard/board/SConscript index d0a821621f..eb181d7948 100644 --- a/bsp/apm32/apm32f103xe-minibroard/board/SConscript +++ b/bsp/apm32/apm32f103xe-minibroard/board/SConscript @@ -15,13 +15,13 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/arm/startup_apm32f10x_hd.s'] if rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/iar/startup_apm32f10x_hd.s'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/gcc/startup_apm32f10x_hd.s'] # You can select chips from the list above diff --git a/bsp/apollo2/libraries/startup/SConscript b/bsp/apollo2/libraries/startup/SConscript index 865befb6e9..1deac49d11 100644 --- a/bsp/apollo2/libraries/startup/SConscript +++ b/bsp/apollo2/libraries/startup/SConscript @@ -10,9 +10,9 @@ src = Split(""" """) # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['gcc/' + 'startup_gcc.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['arm/' + 'startup_keil.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['iar/' + 'startup_iar.c'] diff --git a/bsp/at32/at32f403a-start/board/SConscript b/bsp/at32/at32f403a-start/board/SConscript index 1ae127cf52..dae1c31ce9 100644 --- a/bsp/at32/at32f403a-start/board/SConscript +++ b/bsp/at32/at32f403a-start/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/f403a_407/firmware/cmsis/cm4/device_support/startup/gcc/startup_at32f403a_407.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/f403a_407/firmware/cmsis/cm4/device_support/startup/mdk/startup_at32f403a_407.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/f403a_407/firmware/cmsis/cm4/device_support/startup/iar/startup_at32f403a_407.s'] diff --git a/bsp/at32/at32f407-start/board/SConscript b/bsp/at32/at32f407-start/board/SConscript index e02453aef3..509d11d5c9 100644 --- a/bsp/at32/at32f407-start/board/SConscript +++ b/bsp/at32/at32f407-start/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/f403a_407/firmware/cmsis/cm4/device_support/startup/gcc/startup_at32f403a_407.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/f403a_407/firmware/cmsis/cm4/device_support/startup/mdk/startup_at32f403a_407.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/f403a_407/firmware/cmsis/cm4/device_support/startup/iar/startup_at32f403a_407.s'] diff --git a/bsp/at32/at32f435-start/board/SConscript b/bsp/at32/at32f435-start/board/SConscript index 21bfa101bd..20471cdd2d 100644 --- a/bsp/at32/at32f435-start/board/SConscript +++ b/bsp/at32/at32f435-start/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/f435_437/firmware/cmsis/cm4/device_support/startup/gcc/startup_at32f435_437.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/f435_437/firmware/cmsis/cm4/device_support/startup/mdk/startup_at32f435_437.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/f435_437/firmware/cmsis/cm4/device_support/startup/iar/startup_at32f435_437.s'] diff --git a/bsp/at32/at32f437-start/board/SConscript b/bsp/at32/at32f437-start/board/SConscript index da97b6b145..f2bd1c028d 100644 --- a/bsp/at32/at32f437-start/board/SConscript +++ b/bsp/at32/at32f437-start/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/f435_437/firmware/cmsis/cm4/device_support/startup/gcc/startup_at32f435_437.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/f435_437/firmware/cmsis/cm4/device_support/startup/mdk/startup_at32f435_437.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/f435_437/firmware/cmsis/cm4/device_support/startup/iar/startup_at32f435_437.s'] diff --git a/bsp/at91/at91sam9260/platform/SConscript b/bsp/at91/at91sam9260/platform/SConscript index 5a6ec4d75e..f984f7d773 100644 --- a/bsp/at91/at91sam9260/platform/SConscript +++ b/bsp/at91/at91sam9260/platform/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() CPPPATH = [cwd] # The set of source files associated with this SConscript file. -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src = Glob('*.c') + Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/bsp/at91/at91sam9g45/platform/SConscript b/bsp/at91/at91sam9g45/platform/SConscript index 5a6ec4d75e..f984f7d773 100644 --- a/bsp/at91/at91sam9g45/platform/SConscript +++ b/bsp/at91/at91sam9g45/platform/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() CPPPATH = [cwd] # The set of source files associated with this SConscript file. -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src = Glob('*.c') + Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/bsp/bluetrum/libcpu/cpu/SConscript b/bsp/bluetrum/libcpu/cpu/SConscript index 7dfe705325..61f2b51e12 100644 --- a/bsp/bluetrum/libcpu/cpu/SConscript +++ b/bsp/bluetrum/libcpu/cpu/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/bsp/efm32/Libraries/SConscript b/bsp/efm32/Libraries/SConscript index 0cb8856f89..a45486a3e0 100644 --- a/bsp/efm32/Libraries/SConscript +++ b/bsp/efm32/Libraries/SConscript @@ -4,7 +4,7 @@ from building import * # get current directory cwd = GetCurrentDir() -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': compiler = 'GCC' # The set of source files associated with this SConscript file. diff --git a/bsp/essemi/es32f0654/libraries/SConscript b/bsp/essemi/es32f0654/libraries/SConscript index 04d2eae28b..fc865183a7 100644 --- a/bsp/essemi/es32f0654/libraries/SConscript +++ b/bsp/essemi/es32f0654/libraries/SConscript @@ -11,9 +11,9 @@ src = [] src += Glob('ES32F065x_ALD_StdPeriph_Driver/Source/*.c') #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['CMSIS/Device/EastSoft/ES32F065x/Startup/gcc/startup_es32f065x.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/EastSoft/ES32F065x/Startup/keil/startup_es32f065x.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['CMSIS/Device/EastSoft/ES32F065x/Startup/iar/startup_es32f065x.s'] diff --git a/bsp/essemi/es32f369x/libraries/SConscript b/bsp/essemi/es32f369x/libraries/SConscript index 4cdef5ad4f..31284a848d 100644 --- a/bsp/essemi/es32f369x/libraries/SConscript +++ b/bsp/essemi/es32f369x/libraries/SConscript @@ -11,9 +11,9 @@ src = [] src += Glob('ES32F36xx_ALD_StdPeriph_Driver/Source/*.c') #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['CMSIS/Device/EastSoft/ES32F36xx/Startup/gcc/startup_es32f36xx.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/EastSoft/ES32F36xx/Startup/keil/startup_es32f36xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['CMSIS/Device/EastSoft/ES32F36xx/Startup/iar/startup_es32f36xx.s'] diff --git a/bsp/fm33lc026/board/SConscript b/bsp/fm33lc026/board/SConscript index 560310ab0a..099adce14d 100644 --- a/bsp/fm33lc026/board/SConscript +++ b/bsp/fm33lc026/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/FM/FM33xx/Source/Templates/gcc/startup_fm33lc0xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/FM/FM33xx/Source/Templates/ARM/startup_fm33lc0xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/FM/FM33xx/Source/Templates/iar/startup_fm33lc0xx.s'] diff --git a/bsp/frdm-k64f/device/SConscript b/bsp/frdm-k64f/device/SConscript index d91ae0576f..957b670b0e 100644 --- a/bsp/frdm-k64f/device/SConscript +++ b/bsp/frdm-k64f/device/SConscript @@ -11,11 +11,11 @@ src = Glob('MK64F12/*.c') src += ['system_MK64F12.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['TOOLCHAIN_GCC_ARM/startup_MK64F12.S'] src = src + ['TOOLCHAIN_GCC_ARM/startup.c'] path += [cwd + 'TOOLCHAIN_GCC_ARM'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['TOOLCHAIN_ARM_STD/startup_MK64F12.s'] # elif rtconfig.CROSS_TOOL == 'iar': diff --git a/bsp/ft32/ft32f072xb-starter/board/SConscript b/bsp/ft32/ft32f072xb-starter/board/SConscript index c00493fb4d..6366633b29 100644 --- a/bsp/ft32/ft32f072xb-starter/board/SConscript +++ b/bsp/ft32/ft32f072xb-starter/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/FT32F0xx/CMSIS/FT32F0xx/source/gcc/startup_ft32f072xb.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/FT32F0xx/CMSIS/FT32F0xx/source/arm/startup_ft32f072xb.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/FT32F0xx/CMSIS/FT32F0xx/source/iar/startup_ft32f072xb.s'] diff --git a/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript b/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript index 165b344fe8..6c7e1add38 100644 --- a/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript @@ -5,9 +5,9 @@ from building import * src = Glob('*.c') # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['start_gcc.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['start_rvds.S'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['start_iar.S'] diff --git a/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript b/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript index a0fa5ca72d..7abee89519 100644 --- a/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript @@ -7,9 +7,9 @@ src = Glob('*.c') src = ['Device/FUJISTU/MB9BF50x/Source/system_mb9bf50x.c'] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['Device/FUJISTU/MB9BF50x/Source/G++/startup_mb9bf50x.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['Device/FUJISTU/MB9BF50x/Source/ARM/startup_mb9bf50x.S'] elif rtconfig.CROSS_TOOL == 'iar': src += ['Device/FUJISTU/MB9BF50x/Source/IAR/startup_mb9bf50x.S'] diff --git a/bsp/fujitsu/mb9x/mb9bf568r/CMSIS/SConscript b/bsp/fujitsu/mb9x/mb9bf568r/CMSIS/SConscript index 6ab907fca5..4e888d2a7c 100644 --- a/bsp/fujitsu/mb9x/mb9bf568r/CMSIS/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf568r/CMSIS/SConscript @@ -8,10 +8,10 @@ src = Glob('DeviceSupport/*.c') CPPPATH = [cwd + '/Include', cwd + '/DeviceSupport'] # add for startup script -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['DeviceSupport/arm/startup_mb9bf56xr.s'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['DeviceSupport/gcc/startup_mb9bf56xr.S'] group = DefineGroup('CMSIS', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript b/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript index 64f6f21408..d40b425c58 100644 --- a/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript @@ -8,9 +8,9 @@ src = Glob('DeviceSupport/fujitsu/mb9bf61x/*.c') CPPPATH = [cwd + '/Include', cwd + '/DeviceSupport/fujitsu/mb9bf61x/'] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['DeviceSupport/fujitsu/mb9bf61x/startup/gcc/startup_mb9bf61x.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['DeviceSupport/fujitsu/mb9bf61x/startup/arm/startup_mb9bf61x.S'] elif rtconfig.CROSS_TOOL == 'iar': src += ['DeviceSupport/fujitsu/mb9bf61x/startup/iar/startup_mb9bf61x.S'] diff --git a/bsp/gd32/docs/GD32系列BSP制作教程.md b/bsp/gd32/docs/GD32系列BSP制作教程.md index 6b35a33850..6607aa335d 100644 --- a/bsp/gd32/docs/GD32系列BSP制作教程.md +++ b/bsp/gd32/docs/GD32系列BSP制作教程.md @@ -700,7 +700,7 @@ startup_path_prefix = SDK_LIB if rtconfig.CROSS_TOOL == 'gcc': src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/GCC/startup_gd32f4xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s'] diff --git a/bsp/gd32/gd32103c-eval/board/SConscript b/bsp/gd32/gd32103c-eval/board/SConscript index 95b0a6e9ac..45487fdb9e 100644 --- a/bsp/gd32/gd32103c-eval/board/SConscript +++ b/bsp/gd32/gd32103c-eval/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_hd.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_hd.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_hd.s'] diff --git a/bsp/gd32/gd32105c-eval/board/SConscript b/bsp/gd32/gd32105c-eval/board/SConscript index c1f4a6001b..ad9aaef370 100644 --- a/bsp/gd32/gd32105c-eval/board/SConscript +++ b/bsp/gd32/gd32105c-eval/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] diff --git a/bsp/gd32/gd32105r-start/board/SConscript b/bsp/gd32/gd32105r-start/board/SConscript index c1f4a6001b..ad9aaef370 100644 --- a/bsp/gd32/gd32105r-start/board/SConscript +++ b/bsp/gd32/gd32105r-start/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] diff --git a/bsp/gd32/gd32107c-eval/board/SConscript b/bsp/gd32/gd32107c-eval/board/SConscript index c1f4a6001b..ad9aaef370 100644 --- a/bsp/gd32/gd32107c-eval/board/SConscript +++ b/bsp/gd32/gd32107c-eval/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] diff --git a/bsp/gd32/gd32205r-start/board/SConscript b/bsp/gd32/gd32205r-start/board/SConscript index d1c8023578..87645eb78a 100644 --- a/bsp/gd32/gd32205r-start/board/SConscript +++ b/bsp/gd32/gd32205r-start/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F20x_Firmware_Library/CMSIS/GD/GD32F20x/Source/GCC/startup_gd32f20x_cl.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F20x_Firmware_Library/CMSIS/GD/GD32F20x/Source/ARM/startup_gd32f20x_cl.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F20x_Firmware_Library/CMSIS/GD/GD32F20x/Source/IAR/startup_gd32f20x_cl.s'] diff --git a/bsp/gd32/gd32303e-eval/board/SConscript b/bsp/gd32/gd32303e-eval/board/SConscript index 1d4c0408eb..d023a96a2f 100644 --- a/bsp/gd32/gd32303e-eval/board/SConscript +++ b/bsp/gd32/gd32303e-eval/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/GCC/startup_gd32f30x_hd.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/ARM/startup_gd32f30x_hd.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/IAR/startup_gd32f30x_hd.s'] diff --git a/bsp/gd32/gd32305r-start/board/SConscript b/bsp/gd32/gd32305r-start/board/SConscript index ec6b7bf3c1..73501b86f4 100644 --- a/bsp/gd32/gd32305r-start/board/SConscript +++ b/bsp/gd32/gd32305r-start/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/GCC/startup_gd32f30x_cl.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/ARM/startup_gd32f30x_cl.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/IAR/startup_gd32f30x_cl.s'] diff --git a/bsp/gd32/gd32407v-start/board/SConscript b/bsp/gd32/gd32407v-start/board/SConscript index 171600e2e1..f386c03996 100644 --- a/bsp/gd32/gd32407v-start/board/SConscript +++ b/bsp/gd32/gd32407v-start/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/GCC/startup_gd32f4xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s'] diff --git a/bsp/gd32/gd32450i-eval/board/SConscript b/bsp/gd32/gd32450i-eval/board/SConscript index 77a18f74e1..b1ae6aa30e 100644 --- a/bsp/gd32/gd32450i-eval/board/SConscript +++ b/bsp/gd32/gd32450i-eval/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/GCC/startup_gd32f4xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s'] diff --git a/bsp/gd32/gd32450z-eval/board/SConscript b/bsp/gd32/gd32450z-eval/board/SConscript index 77a18f74e1..b1ae6aa30e 100644 --- a/bsp/gd32/gd32450z-eval/board/SConscript +++ b/bsp/gd32/gd32450z-eval/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/GCC/startup_gd32f4xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s'] diff --git a/bsp/gd32105c-eval/Libraries/SConscript b/bsp/gd32105c-eval/Libraries/SConscript index bdfd09f67b..2c49ad231f 100644 --- a/bsp/gd32105c-eval/Libraries/SConscript +++ b/bsp/gd32105c-eval/Libraries/SConscript @@ -10,9 +10,9 @@ src = Glob('GD32F10x_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F10x/Source/system_gd32f10x.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [cwd + '/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] diff --git a/bsp/gd32107c-eval/Libraries/SConscript b/bsp/gd32107c-eval/Libraries/SConscript index bdfd09f67b..2c49ad231f 100644 --- a/bsp/gd32107c-eval/Libraries/SConscript +++ b/bsp/gd32107c-eval/Libraries/SConscript @@ -10,9 +10,9 @@ src = Glob('GD32F10x_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F10x/Source/system_gd32f10x.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [cwd + '/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] diff --git a/bsp/gd32303e-eval/Libraries/SConscript b/bsp/gd32303e-eval/Libraries/SConscript index 2d3b323d2e..c1ad056207 100644 --- a/bsp/gd32303e-eval/Libraries/SConscript +++ b/bsp/gd32303e-eval/Libraries/SConscript @@ -10,9 +10,9 @@ src = Glob('GD32F30x_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F30x/Source/system_gd32f30x.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/CMSIS/GD/GD32F30x/Source/GCC/startup_gd32f30x_hd.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F30x/Source/ARM/startup_gd32f30x_hd.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [cwd + '/CMSIS/GD/GD32F30x/Source/IAR/startup_gd32f30x_hd.s'] diff --git a/bsp/gd32350r-eval/Libraries/SConscript b/bsp/gd32350r-eval/Libraries/SConscript index dad0c6c89e..eb25cf1e7a 100644 --- a/bsp/gd32350r-eval/Libraries/SConscript +++ b/bsp/gd32350r-eval/Libraries/SConscript @@ -10,9 +10,9 @@ src = Glob('GD32F3x0_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F3x0/Source/system_gd32f3x0.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/CMSIS/GD/GD32F3x0/Source/GCC/startup_gd32f3x0.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F3x0/Source/ARM/startup_gd32f3x0.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [cwd + '/CMSIS/GD/GD32F3x0/Source/IAR/startup_gd32f3x0.s'] diff --git a/bsp/gd32450z-eval/Libraries/SConscript b/bsp/gd32450z-eval/Libraries/SConscript index e9d6e45aae..42e112815a 100644 --- a/bsp/gd32450z-eval/Libraries/SConscript +++ b/bsp/gd32450z-eval/Libraries/SConscript @@ -10,9 +10,9 @@ src = Glob('GD32F4xx_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F4xx/Source/system_gd32f4xx.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/CMSIS/GD/GD32F4xx/Source/GCC/startup_gd32f4xx.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [cwd + '/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s'] diff --git a/bsp/gd32e230k-start/Libraries/SConscript b/bsp/gd32e230k-start/Libraries/SConscript index f621432d3d..7d8683a664 100644 --- a/bsp/gd32e230k-start/Libraries/SConscript +++ b/bsp/gd32e230k-start/Libraries/SConscript @@ -10,7 +10,7 @@ src = Glob('GD32E230_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32E230/Source/system_gd32e230.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32E230/Source/ARM/startup_gd32e230.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [cwd + '/CMSIS/GD/GD32E230/Source/IAR/startup_gd32e230.s'] diff --git a/bsp/hc32f460/Libraries/SConscript b/bsp/hc32f460/Libraries/SConscript index d34278922c..579e740f6f 100644 --- a/bsp/hc32f460/Libraries/SConscript +++ b/bsp/hc32f460/Libraries/SConscript @@ -27,9 +27,9 @@ if GetDepend(['RT_USING_SERIAL']): src += ['HC32F460_StdPeriph_Driver/src/hc32f460_usart.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['CMSIS/Device/HDSC/HC32F460/Source/GCC/startup_hc32f460.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/HDSC/HC32F460/Source/ARM/startup_hc32f460.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['CMSIS/Device/HDSC/HC32F460/Source/IAR/startup_hc32f460.s'] diff --git a/bsp/hc32f4a0/Libraries/SConscript b/bsp/hc32f4a0/Libraries/SConscript index c5cb672a38..c725b7c83a 100644 --- a/bsp/hc32f4a0/Libraries/SConscript +++ b/bsp/hc32f4a0/Libraries/SConscript @@ -51,9 +51,9 @@ if GetDepend(['RT_USING_HWTIMER']) or GetDepend(['RT_USING_PWM'] or GetDepend([' src += ['HC32F4A0_StdPeriph_Driver/src/hc32f4a0_tmra.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['CMSIS/Device/HDSC/HC32F4A0/Source/GCC/startup_hc32f4a0.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/HDSC/HC32F4A0/Source/ARM/startup_hc32f4a0.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['CMSIS/Device/HDSC/HC32F4A0/Source/IAR/startup_hc32f4a0.s'] diff --git a/bsp/hc32l136/Libraries/SConscript b/bsp/hc32l136/Libraries/SConscript index f8e856e883..d5a8e25e97 100644 --- a/bsp/hc32l136/Libraries/SConscript +++ b/bsp/hc32l136/Libraries/SConscript @@ -29,9 +29,9 @@ if GetDepend(['RT_USING_WDT']): src += ['HC32L136_StdPeriph_Driver/src/wdt.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['CMSIS/Device/HDSC/HC32L136/Source/GCC/startup_hc32l136.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/HDSC/HC32L136/Source/ARM/startup_hc32l136.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['CMSIS/Device/HDSC/HC32L136/Source/IAR/startup_hc32l136.s'] diff --git a/bsp/hc32l196/Libraries/SConscript b/bsp/hc32l196/Libraries/SConscript index 2e4b5bf169..e89dc609be 100644 --- a/bsp/hc32l196/Libraries/SConscript +++ b/bsp/hc32l196/Libraries/SConscript @@ -21,9 +21,9 @@ if GetDepend(['RT_USING_SERIAL']): src += ['HC32L196_StdPeriph_Driver/src/hc32l196_uart.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['CMSIS/Device/HDSC/HC32L196/Source/GCC/startup_hc32l19x.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/HDSC/HC32L196/Source/ARM/startup_hc32l19x.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['CMSIS/Device/HDSC/HC32L196/Source/IAR/startup_hc32l19x.s'] diff --git a/bsp/hk32/hk32f030c8-mini/board/SConscript b/bsp/hk32/hk32f030c8-mini/board/SConscript index 3d80fbea49..62c5d1532d 100644 --- a/bsp/hk32/hk32f030c8-mini/board/SConscript +++ b/bsp/hk32/hk32f030c8-mini/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/msp'] startup_path_prefix = SDK_LIB src += [startup_path_prefix + '/HK32F0xx_StdPeriph_Driver/CMSIS/HK32F0xx/Source/system_hk32f0xx.c'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/HK32F0xx_StdPeriph_Driver/CMSIS/HK32F0xx/Source/gcc/startup_hk32f030x4x6x8.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/HK32F0xx_StdPeriph_Driver/CMSIS/HK32F0xx/Source/ARM/startup_hk32f030x4x6x8.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/HK32F0xx_StdPeriph_Driver/CMSIS/HK32F0xx/Source/iar/startup_hk32f030x4x6x8.s'] diff --git a/bsp/imx6sx/cortex-a9/cpu/SConscript b/bsp/imx6sx/cortex-a9/cpu/SConscript index 0d26b7a04b..d845dc486a 100644 --- a/bsp/imx6sx/cortex-a9/cpu/SConscript +++ b/bsp/imx6sx/cortex-a9/cpu/SConscript @@ -9,7 +9,7 @@ if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') elif rtconfig.PLATFORM == 'gcc': src += Glob('*_gcc.S') -elif rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/imxrt/imxrt1052-atk-commander/applications/SConscript b/bsp/imxrt/imxrt1052-atk-commander/applications/SConscript index 78952a658e..256e8a5a0c 100644 --- a/bsp/imxrt/imxrt1052-atk-commander/applications/SConscript +++ b/bsp/imxrt/imxrt1052-atk-commander/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1052-fire-pro/applications/SConscript b/bsp/imxrt/imxrt1052-fire-pro/applications/SConscript index 78952a658e..256e8a5a0c 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/applications/SConscript +++ b/bsp/imxrt/imxrt1052-fire-pro/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1052-nxp-evk/applications/SConscript b/bsp/imxrt/imxrt1052-nxp-evk/applications/SConscript index 78952a658e..256e8a5a0c 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/applications/SConscript +++ b/bsp/imxrt/imxrt1052-nxp-evk/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1052-nxp-evk/xip/SConscript b/bsp/imxrt/imxrt1052-nxp-evk/xip/SConscript index 0cee6311ea..56df6b3339 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/xip/SConscript +++ b/bsp/imxrt/imxrt1052-nxp-evk/xip/SConscript @@ -7,7 +7,7 @@ if GetDepend('BSP_USING_HYPERFLASH'): src = Glob('*.c') CPPPATH = [cwd] - if rtconfig.CROSS_TOOL == 'keil': + if rtconfig.PLATFORM in ['armcc', 'armclang']: LINKFLAGS = '--keep=*(.boot_hdr.ivt)' LINKFLAGS += '--keep=*(.boot_hdr.boot_data)' LINKFLAGS += '--keep=*(.boot_hdr.dcd_data)' diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript b/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript index 78952a658e..256e8a5a0c 100644 --- a/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript +++ b/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1060-nxp-evk/applications/SConscript b/bsp/imxrt/imxrt1060-nxp-evk/applications/SConscript index 6c8a11d9eb..69e3f9b88e 100644 --- a/bsp/imxrt/imxrt1060-nxp-evk/applications/SConscript +++ b/bsp/imxrt/imxrt1060-nxp-evk/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1060-nxp-evk/board/SConscript b/bsp/imxrt/imxrt1060-nxp-evk/board/SConscript index cf56bbfb2b..b68df69ae2 100644 --- a/bsp/imxrt/imxrt1060-nxp-evk/board/SConscript +++ b/bsp/imxrt/imxrt1060-nxp-evk/board/SConscript @@ -16,7 +16,7 @@ CPPPATH = [cwd,cwd + '/MCUX_Config',cwd + '/ports'] CPPDEFINES = ['CPU_MIMXRT1062DVL6A', 'SKIP_SYSCLK_INIT', 'EVK_MCIMXRM', 'FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1','XIP_EXTERNAL_FLASH=1', 'XIP_BOOT_HEADER_ENABLE=1', 'FSL_SDK_DRIVER_QUICK_ACCESS_ENABLE=1', 'XIP_BOOT_HEADER_DCD_ENABLE=1', 'DATA_SECTION_IS_CACHEABLE=1'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: CPPDEFINES.append('__FPU_PRESENT=1') group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES) diff --git a/bsp/imxrt/imxrt1060-nxp-evk/xip/SConscript b/bsp/imxrt/imxrt1060-nxp-evk/xip/SConscript index 03973c7247..8d49bd248d 100644 --- a/bsp/imxrt/imxrt1060-nxp-evk/xip/SConscript +++ b/bsp/imxrt/imxrt1060-nxp-evk/xip/SConscript @@ -7,7 +7,7 @@ if GetDepend('BSP_USING_4MFLASH'): src = Glob('*.c') CPPPATH = [cwd] - if rtconfig.CROSS_TOOL == 'keil': + if rtconfig.PLATFORM in ['armcc', 'armclang']: LINKFLAGS = '--keep=*(.boot_hdr.ivt)' LINKFLAGS += '--keep=*(.boot_hdr.boot_data)' LINKFLAGS += '--keep=*(.boot_hdr.dcd_data)' diff --git a/bsp/imxrt/imxrt1064-nxp-evk/applications/SConscript b/bsp/imxrt/imxrt1064-nxp-evk/applications/SConscript index 78952a658e..256e8a5a0c 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/applications/SConscript +++ b/bsp/imxrt/imxrt1064-nxp-evk/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1064-nxp-evk/board/SConscript b/bsp/imxrt/imxrt1064-nxp-evk/board/SConscript index 050a6c10bc..d7046f3254 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/board/SConscript +++ b/bsp/imxrt/imxrt1064-nxp-evk/board/SConscript @@ -15,7 +15,7 @@ CPPPATH = [cwd,cwd + '/MCUX_Config',cwd + '/ports'] CPPDEFINES = ['CPU_MIMXRT1064DVL6A', 'SKIP_SYSCLK_INIT', 'EVK_MCIMXRM', 'FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1','XIP_EXTERNAL_FLASH=1', 'XIP_BOOT_HEADER_ENABLE=1', 'XIP_BOOT_HEADER_DCD_ENABLE=1'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: CPPDEFINES.append('__FPU_PRESENT=1') group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES=CPPDEFINES) diff --git a/bsp/imxrt/imxrt1064-nxp-evk/xip/SConscript b/bsp/imxrt/imxrt1064-nxp-evk/xip/SConscript index 1b499b98c6..db3794f2de 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/xip/SConscript +++ b/bsp/imxrt/imxrt1064-nxp-evk/xip/SConscript @@ -7,7 +7,7 @@ if GetDepend('BSP_USING_4MFLASH'): src = Glob('*.c') CPPPATH = [cwd] - if rtconfig.CROSS_TOOL == 'keil': + if rtconfig.PLATFORM in ['armcc', 'armclang']: LINKFLAGS = '--keep=*(.boot_hdr.ivt)' LINKFLAGS += '--keep=*(.boot_hdr.boot_data)' LINKFLAGS += '--keep=*(.boot_hdr.dcd_data)' diff --git a/bsp/imxrt/libraries/MIMXRT1050/SConscript b/bsp/imxrt/libraries/MIMXRT1050/SConscript index 58a2922fe1..e28febe813 100644 --- a/bsp/imxrt/libraries/MIMXRT1050/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1050/SConscript @@ -10,9 +10,9 @@ src = Split(''' MIMXRT1052/drivers/fsl_cache.c ''') -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['MIMXRT1052/gcc/startup_MIMXRT1052.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MIMXRT1052/arm/startup_MIMXRT1052.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['MIMXRT1052/iar/startup_MIMXRT1052.s'] @@ -87,7 +87,7 @@ src += ['MIMXRT1052/drivers/fsl_xbarb.c'] src += ['MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c'] src += ['MIMXRT1052/drivers/generic_list.c'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, ASFLAGS = '$ASFLAGS -D __STARTUP_CLEAR_BSS') else: group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) diff --git a/bsp/imxrt/libraries/MIMXRT1060/SConscript b/bsp/imxrt/libraries/MIMXRT1060/SConscript index f5cf056c24..82dbf5af04 100644 --- a/bsp/imxrt/libraries/MIMXRT1060/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1060/SConscript @@ -10,9 +10,9 @@ src = Split(''' MIMXRT1060/drivers/fsl_cache.c ''') -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['MIMXRT1060/gcc/startup_MIMXRT1062.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MIMXRT1060/arm/startup_MIMXRT1062.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['MIMXRT1060/iar/startup_MIMXRT1062.s'] @@ -99,7 +99,7 @@ src += ['MIMXRT1060/drivers/fsl_xbarb.c'] # src += ['MIMXRT1060/drivers/fsl_os_abstraction_rtthread.c'] # src += ['MIMXRT1060/drivers/generic_list.c'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, ASFLAGS = '$ASFLAGS -D __STARTUP_CLEAR_BSS') else: group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) diff --git a/bsp/imxrt/libraries/MIMXRT1064/SConscript b/bsp/imxrt/libraries/MIMXRT1064/SConscript index 5cdbdace40..38124f8f7e 100644 --- a/bsp/imxrt/libraries/MIMXRT1064/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1064/SConscript @@ -10,9 +10,9 @@ MIMXRT1064/drivers/fsl_clock.c MIMXRT1064/drivers/fsl_cache.c ''') -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['MIMXRT1064/gcc/startup_MIMXRT1064.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MIMXRT1064/arm/startup_MIMXRT1064.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['MIMXRT1064/iar/startup_MIMXRT1064.s'] @@ -77,7 +77,7 @@ if GetDepend(['RT_SERIAL_USING_DMA']): src += ['MIMXRT1064/drivers/fsl_lpuart_edma.c'] src += ['MIMXRT1064/drivers/fsl_lpspi_edma.c'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, ASFLAGS = '$ASFLAGS -D __STARTUP_CLEAR_BSS') else: group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript b/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript index 78952a658e..256e8a5a0c 100644 --- a/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript +++ b/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript b/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript index 78952a658e..256e8a5a0c 100644 --- a/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript +++ b/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/SConscript b/bsp/imxrt/libraries/templates/imxrt1064xxx/board/SConscript index 2cfdaa6368..4776fd97a1 100644 --- a/bsp/imxrt/libraries/templates/imxrt1064xxx/board/SConscript +++ b/bsp/imxrt/libraries/templates/imxrt1064xxx/board/SConscript @@ -13,7 +13,7 @@ MCUX_Config/pin_mux.c CPPPATH = [cwd,cwd + '/MCUX_Config',cwd + '/ports'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: CPPDEFINES = ['CPU_MIMXRT1064DVL6A', 'STD=C99', 'SKIP_SYSCLK_INIT', 'EVK_MCIMXRM', 'FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL','XIP_EXTERNAL_FLASH=1', 'XIP_BOOT_HEADER_ENABLE=1', '__CC_ARM', 'NDEBUG', '__FPU_PRESENT=1'] else: CPPDEFINES = ['CPU_MIMXRT1064DVL6A', 'STD=C99', 'SKIP_SYSCLK_INIT', 'EVK_MCIMXRM', 'FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL','XIP_EXTERNAL_FLASH=1', 'XIP_BOOT_HEADER_ENABLE=1'] diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/SConscript b/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/SConscript index 1b499b98c6..db3794f2de 100644 --- a/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/SConscript +++ b/bsp/imxrt/libraries/templates/imxrt1064xxx/xip/SConscript @@ -7,7 +7,7 @@ if GetDepend('BSP_USING_4MFLASH'): src = Glob('*.c') CPPPATH = [cwd] - if rtconfig.CROSS_TOOL == 'keil': + if rtconfig.PLATFORM in ['armcc', 'armclang']: LINKFLAGS = '--keep=*(.boot_hdr.ivt)' LINKFLAGS += '--keep=*(.boot_hdr.boot_data)' LINKFLAGS += '--keep=*(.boot_hdr.dcd_data)' diff --git a/bsp/lm3s8962/Libraries/SConscript b/bsp/lm3s8962/Libraries/SConscript index cb209ba4df..100cf72b4a 100644 --- a/bsp/lm3s8962/Libraries/SConscript +++ b/bsp/lm3s8962/Libraries/SConscript @@ -11,9 +11,9 @@ if rtconfig.PART_TYPE.startswith('PART_LM4F') != True: SrcRemove(src, 'fpu.c') # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['startup/gcc/start_gcc.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/arm/start_rvds.S'] elif rtconfig.CROSS_TOOL == 'iar': src += ['startup/iar/start_iar.S'] diff --git a/bsp/lm3s9b9x/Libraries/SConscript b/bsp/lm3s9b9x/Libraries/SConscript index b0631a7d2e..f55bd84efb 100644 --- a/bsp/lm3s9b9x/Libraries/SConscript +++ b/bsp/lm3s9b9x/Libraries/SConscript @@ -11,9 +11,9 @@ if rtconfig.PART_TYPE.startswith('PART_LM4F') != True: SrcRemove(src, 'fpu.c') # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['startup/gcc/start_gcc.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/arm/start_rvds.S'] elif rtconfig.CROSS_TOOL == 'iar': src += ['startup/iar/start_iar.S'] diff --git a/bsp/lm4f232/Libraries/SConscript b/bsp/lm4f232/Libraries/SConscript index d9415142ca..ea5d8102a7 100644 --- a/bsp/lm4f232/Libraries/SConscript +++ b/bsp/lm4f232/Libraries/SConscript @@ -11,9 +11,9 @@ if rtconfig.PART_TYPE.startswith('PART_LM4F') != True: SrcRemove(src, 'fpu.c') # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['startup/gcc/start_gcc.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/arm/start_rvds.S'] elif rtconfig.CROSS_TOOL == 'iar': src += ['startup/iar/start_iar.S'] @@ -21,7 +21,7 @@ elif rtconfig.CROSS_TOOL == 'iar': CPPPATH = [cwd] CPPDEFINES = [rtconfig.PART_TYPE] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES += ['gcc']; group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/lpc176x/CMSIS/SConscript b/bsp/lpc176x/CMSIS/SConscript index d92b482da0..2908e197a3 100644 --- a/bsp/lpc176x/CMSIS/SConscript +++ b/bsp/lpc176x/CMSIS/SConscript @@ -7,9 +7,9 @@ cwd = GetCurrentDir() src = ['CM3/DeviceSupport/NXP/LPC17xx/system_LPC17xx.c'] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['CM3/DeviceSupport/NXP/LPC17xx/startup/gcc/startup_LPC17xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CM3/DeviceSupport/NXP/LPC17xx/startup/arm/startup_LPC17xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['CM3/DeviceSupport/NXP/LPC17xx/startup/iar/startup_LPC17xx.s'] diff --git a/bsp/lpc178x/CMSIS/SConscript b/bsp/lpc178x/CMSIS/SConscript index f8655abda2..9d12b5ade8 100644 --- a/bsp/lpc178x/CMSIS/SConscript +++ b/bsp/lpc178x/CMSIS/SConscript @@ -8,9 +8,9 @@ src = ['CM3/CoreSupport/core_cm3.c', 'CM3/DeviceSupport/NXP/LPC177x_8x/system_LP CPPPATH = [cwd + '/CM3/CoreSupport', cwd + '/CM3/DeviceSupport/NXP/LPC177x_8x/'] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['CM3/DeviceSupport/NXP/LPC177x_8x/startup/gcc/startup_LPC177x_8x.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CM3/DeviceSupport/NXP/LPC177x_8x/startup/arm/startup_LPC177x_8x.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['CM3/DeviceSupport/NXP/LPC177x_8x/startup/iar/startup_LPC177x_8x.s'] diff --git a/bsp/lpc408x/Libraries/Device/SConscript b/bsp/lpc408x/Libraries/Device/SConscript index 6d7e911b8e..f2e567cce7 100644 --- a/bsp/lpc408x/Libraries/Device/SConscript +++ b/bsp/lpc408x/Libraries/Device/SConscript @@ -11,9 +11,9 @@ CPPPATH = [cwd + '/NXP/LPC407x_8x_177x_8x/Include', cwd + '/../CMSIS/Include'] CPPDEFINES = ['CORE_M4'] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['NXP/LPC407x_8x_177x_8x/Source/Templates/GCC/startup_LPC407x_8x_177x_8x.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC407x_8x_177x_8x/Source/Templates/ARM/startup_LPC407x_8x_177x_8x.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['NXP/LPC407x_8x_177x_8x/Source/Templates/IAR/startup_LPC407x_8x_177x_8x.s'] diff --git a/bsp/lpc43xx/Libraries/Device/SConscript b/bsp/lpc43xx/Libraries/Device/SConscript index 47f7e04885..fed180fd71 100644 --- a/bsp/lpc43xx/Libraries/Device/SConscript +++ b/bsp/lpc43xx/Libraries/Device/SConscript @@ -12,16 +12,16 @@ CPPDEFINES = [rtconfig.USE_CORE] CPPDEFINES += ['USE_SPIFI'] # add for startup script if rtconfig.USE_CORE =='CORE_M4': - if rtconfig.CROSS_TOOL == 'gcc': + if rtconfig.PLATFORM == 'gcc': src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx.s'] - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx.s'] else: - if rtconfig.CROSS_TOOL == 'gcc': + if rtconfig.PLATFORM == 'gcc': src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx_M0.s'] - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx_M0.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx_M0.s'] diff --git a/bsp/lpc43xx/M0/SConstruct b/bsp/lpc43xx/M0/SConstruct index f47153fb9b..25291318dd 100644 --- a/bsp/lpc43xx/M0/SConstruct +++ b/bsp/lpc43xx/M0/SConstruct @@ -26,7 +26,7 @@ Export('rtconfig') # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': import glob # Remove the .o for M0 left on the drivers dir. for i in glob.glob(GetCurrentDir() + '/../drivers/*.o'): diff --git a/bsp/lpc43xx/M4/SConstruct b/bsp/lpc43xx/M4/SConstruct index 84affbd2ec..b83f0114f1 100644 --- a/bsp/lpc43xx/M4/SConstruct +++ b/bsp/lpc43xx/M4/SConstruct @@ -26,7 +26,7 @@ Export('rtconfig') # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': print('build M0 code first') if sys.platform.startswith('linux'): import glob diff --git a/bsp/lpc5410x/Libraries/Device/SConscript b/bsp/lpc5410x/Libraries/Device/SConscript index 40a74f1541..56fd075178 100644 --- a/bsp/lpc5410x/Libraries/Device/SConscript +++ b/bsp/lpc5410x/Libraries/Device/SConscript @@ -12,9 +12,9 @@ CPPDEFINES = ['CORE_M4'] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['startup/gcc_startup_lpc5410x.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/keil_startup_lpc5410x.s'] group = DefineGroup('CMSIS', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/lpc5410x/Libraries/lpc_chip/SConscript b/bsp/lpc5410x/Libraries/lpc_chip/SConscript index 5244ddab27..6b9cd35fd5 100644 --- a/bsp/lpc5410x/Libraries/lpc_chip/SConscript +++ b/bsp/lpc5410x/Libraries/lpc_chip/SConscript @@ -61,10 +61,10 @@ chip_5410x/wwdt_5410x.c #lpc_chip\chip_5410x\power_lib\lpcxpresso # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': LIBPATH = [cwd + '/chip_5410x/power_lib/lpcxpresso'] LIBS = ['libpower'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: LIBPATH = [cwd + '/chip_5410x/power_lib/keil'] LIBS = ['lib_power'] diff --git a/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript b/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript index 34fd4268fb..c12c562320 100644 --- a/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript +++ b/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript @@ -13,10 +13,10 @@ CPPDEFINES = [] objs = objs + SConscript(os.path.join('drivers', 'SConscript')) objs = objs + SConscript(os.path.join('utilities', 'SConscript')) -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': objs = objs + SConscript(os.path.join('gcc', 'SConscript')) CPPDEFINES += ['__USE_CMSIS'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: objs = objs + SConscript(os.path.join('arm', 'SConscript')) elif rtconfig.CROSS_TOOL == 'iar': objs = objs + SConscript(os.path.join('iar', 'SConscript')) diff --git a/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript b/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript index 722ca5f9e1..3b59a9726c 100644 --- a/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript +++ b/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript @@ -13,10 +13,10 @@ CPPDEFINES = [] objs = objs + SConscript(os.path.join('drivers', 'SConscript')) objs = objs + SConscript(os.path.join('utilities', 'SConscript')) -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': objs = objs + SConscript(os.path.join('mcuxpresso', 'SConscript')) CPPDEFINES += ['__USE_CMSIS'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: objs = objs + SConscript(os.path.join('arm', 'SConscript')) elif rtconfig.CROSS_TOOL == 'iar': objs = objs + SConscript(os.path.join('iar', 'SConscript')) diff --git a/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript b/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript index 73a71bcccb..140e3af64f 100644 --- a/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript +++ b/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript @@ -7,9 +7,9 @@ src = Split(''' LPC55S6X/system_LPC55S69_cm33_core0.c ''') -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['LPC55S6X/gcc/startup_LPC55S69_cm33_core0.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['LPC55S6X/arm/startup_LPC55S69_cm33_core0.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['LPC55S6X/iar/startup_LPC55S69_cm33_core0.s'] @@ -58,9 +58,9 @@ src += ['middleware/sdmmc/src/fsl_sdmmc_common.c'] src += ['middleware/sdmmc/port/sdif/rt_thread/fsl_sdmmc_event.c'] src += ['middleware/sdmmc/port/sdif/rt_thread/fsl_sdmmc_host.c'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['LPC55S6X/gcc/libpower_hardabi.a'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['LPC55S6X/arm/keil_lib_power_cm33_core0.lib'] elif rtconfig.CROSS_TOOL == 'iar': src += ['LPC55S6X/iar/iar_lib_power_cm33_core0.a'] diff --git a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/SConscript b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/SConscript index 78952a658e..256e8a5a0c 100644 --- a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/SConscript +++ b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript index 89d07934b7..41ccd00018 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('main.c') CPPPATH = [cwd] # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/lpc824/Libraries/SConscript b/bsp/lpc824/Libraries/SConscript index 52f9662e6b..31c3ce5a01 100644 --- a/bsp/lpc824/Libraries/SConscript +++ b/bsp/lpc824/Libraries/SConscript @@ -11,10 +11,10 @@ src += Glob('common/board/*.c') src += Glob('common/chip/*.c') # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': print("not gcc startup file") exit(0) -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/common/startup/keil_startup_lpc82x.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [cwd + '/common/startup/iar_startup_lpc82x.s'] diff --git a/bsp/m16c62p/drivers/SConscript b/bsp/m16c62p/drivers/SConscript index 3d5e44a058..65e7884cbd 100644 --- a/bsp/m16c62p/drivers/SConscript +++ b/bsp/m16c62p/drivers/SConscript @@ -5,7 +5,7 @@ cwd = GetCurrentDir() src_c = Glob('*.c') # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src_asm = ['start_gcc.S', 'vectors_gcc.S', 'interrupts_gcc.S'] elif rtconfig.CROSS_TOOL == 'iar': src_asm = ['start_iar.asm', 'vectors_iar.asm', 'interrupts_iar.asm'] diff --git a/bsp/maxim/MAX32660_EVSYS/board/SConscript b/bsp/maxim/MAX32660_EVSYS/board/SConscript index f2844f9ef6..88b9fd6563 100644 --- a/bsp/maxim/MAX32660_EVSYS/board/SConscript +++ b/bsp/maxim/MAX32660_EVSYS/board/SConscript @@ -15,9 +15,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/GCC/startup_max32660.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/ARM/startup_max32660.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/ARM/startup_max32660.s'] diff --git a/bsp/microchip/samc21/bsp/SConscript b/bsp/microchip/samc21/bsp/SConscript index 558922007f..c1e872bb18 100644 --- a/bsp/microchip/samc21/bsp/SConscript +++ b/bsp/microchip/samc21/bsp/SConscript @@ -31,10 +31,10 @@ src += [cwd + '/atmel_start.c'] src += [cwd + '/driver_init.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/samc21/gcc/system_samc21.c'] src += [cwd + '/samc21/gcc/gcc/startup_samc21.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/samc21/armcc/arm_addon/armcc/' + 'system_samc21.c'] src += [cwd + '/samc21/armcc/arm_addon/armcc/arm/' + 'startup_samc21.s'] elif rtconfig.CROSS_TOOL == 'iar': diff --git a/bsp/microchip/same54/bsp/SConscript b/bsp/microchip/same54/bsp/SConscript index fe928e7559..64dd753729 100644 --- a/bsp/microchip/same54/bsp/SConscript +++ b/bsp/microchip/same54/bsp/SConscript @@ -35,10 +35,10 @@ src += [cwd + '/driver_init.c'] src += [cwd + '/ethernet_phy_main.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/gcc/system_same54.c'] src += [cwd + '/gcc/gcc/startup_same54.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/armcc/arm_addon/armcc/' + 'system_same54.c'] src += [cwd + '/armcc/arm_addon/armcc/arm/' + 'startup_same54.s'] elif rtconfig.CROSS_TOOL == 'iar': diff --git a/bsp/microchip/same70/bsp/SConscript b/bsp/microchip/same70/bsp/SConscript index d536217949..f65a9b9b37 100644 --- a/bsp/microchip/same70/bsp/SConscript +++ b/bsp/microchip/same70/bsp/SConscript @@ -29,10 +29,10 @@ src += [cwd + '/driver_init.c'] src += [cwd + '/ethernet_phy_main.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/same70b/gcc/system_same70q21b.c'] src += [cwd + '/same70b/gcc/gcc/startup_same70q21b.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/same70b/armcc/Source/' + 'system_same70q21b.c'] src += [cwd + '/same70b/armcc/Source/ARM/' + 'startup_SAME70.s'] elif rtconfig.CROSS_TOOL == 'iar': diff --git a/bsp/mm32f103x/Libraries/SConscript b/bsp/mm32f103x/Libraries/SConscript index 507afb073b..4d2f0588a6 100644 --- a/bsp/mm32f103x/Libraries/SConscript +++ b/bsp/mm32f103x/Libraries/SConscript @@ -7,7 +7,7 @@ CPPPATH = [cwd + '/CMSIS/KEIL_CORE', cwd + '/MM32F103/Include', cwd + '/MM32F10 src += Glob('MM32F103/HAL_lib/src/*.c') CPPDEFINES = ['USE_STDPERIPH_DRIVER'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MM32F103/Source/KEIL_StartAsm/startup_MM32F103.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['MM32F103/Source/IAR_StartAsm/startup_MM32F103.s'] diff --git a/bsp/mm32f327x/Libraries/SConscript b/bsp/mm32f327x/Libraries/SConscript index e720c65f38..8141d25bc1 100644 --- a/bsp/mm32f327x/Libraries/SConscript +++ b/bsp/mm32f327x/Libraries/SConscript @@ -7,7 +7,7 @@ CPPPATH = [cwd + '/CMSIS/KEIL_CORE', cwd + '/MM32F327x/Include', cwd + '/MM32F3 src += Glob('MM32F327x/HAL_lib/src/*.c') CPPDEFINES = ['USE_STDPERIPH_DRIVER'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MM32F327x/Source/KEIL_StartAsm/startup_mm32f327x_keil.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['MM32F327x/Source/IAR_StartAsm/startup_mm32f327x_iar.s'] diff --git a/bsp/mm32l07x/Libraries/SConscript b/bsp/mm32l07x/Libraries/SConscript index 6b7f0385f6..9720355244 100644 --- a/bsp/mm32l07x/Libraries/SConscript +++ b/bsp/mm32l07x/Libraries/SConscript @@ -7,9 +7,9 @@ CPPPATH = [cwd + '/CMSIS/CORE', cwd + '/MM32L0xx/Include', cwd + '/MM32L0xx/Sou src += Glob('MM32L0xx/HAL_lib/src/*.c') CPPDEFINES = ['USE_STDPERIPH_DRIVER'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['MM32L0xx/Source/GCC_StartAsm/startup_MM32L0xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MM32L0xx/Source/KEIL_StartAsm/startup_MM32L0xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['MM32L0xx/Source/IAR_StartAsm/startup_MM32L0xx.s'] diff --git a/bsp/mm32l3xx/Libraries/SConscript b/bsp/mm32l3xx/Libraries/SConscript index 14e95cd282..4190085e28 100644 --- a/bsp/mm32l3xx/Libraries/SConscript +++ b/bsp/mm32l3xx/Libraries/SConscript @@ -7,7 +7,7 @@ CPPPATH = [cwd + '/CMSIS/KEIL_CORE', cwd + '/MM32L3xx/Include', cwd + '/MM32L3x src += Glob('MM32L3xx/HAL_lib/src/*.c') CPPDEFINES = ['USE_STDPERIPH_DRIVER'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MM32L3xx/Source/KEIL_StartAsm/startup_MM32L3xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['MM32L3xx/Source/IAR_StartAsm/startup_MM32L3xx.s'] diff --git a/bsp/n32g452xx/n32g452xx-mini-system/board/SConscript b/bsp/n32g452xx/n32g452xx-mini-system/board/SConscript index 5c446528c0..5a7daeddaa 100755 --- a/bsp/n32g452xx/n32g452xx-mini-system/board/SConscript +++ b/bsp/n32g452xx/n32g452xx-mini-system/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/msp'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/N32_Std_Driver/CMSIS/device/startup/startup_n32g45x_gcc.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/N32_Std_Driver/CMSIS/device/startup/startup_n32g45x.s'] CPPDEFINES = ['N32G45X'] diff --git a/bsp/nuvoton/libraries/m031/Device/SConscript b/bsp/nuvoton/libraries/m031/Device/SConscript index 6513b60c71..c6fdd57987 100644 --- a/bsp/nuvoton/libraries/m031/Device/SConscript +++ b/bsp/nuvoton/libraries/m031/Device/SConscript @@ -11,9 +11,9 @@ Nuvoton/M031/Source/system_M031Series.c """) # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['Nuvoton/M031/Source/GCC/startup_M031Series.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['Nuvoton/M031/Source/ARM/startup_M031Series.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['Nuvoton/M031/Source/IAR/startup_M031Series.s'] diff --git a/bsp/nuvoton/libraries/m031/StdDriver/SConscript b/bsp/nuvoton/libraries/m031/StdDriver/SConscript index 57025d2246..c24f15f472 100644 --- a/bsp/nuvoton/libraries/m031/StdDriver/SConscript +++ b/bsp/nuvoton/libraries/m031/StdDriver/SConscript @@ -9,12 +9,12 @@ cpppath = [cwd + '/inc'] libpath = [cwd + '/lib'] if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): - if rtconfig.CROSS_TOOL == 'keil': + if rtconfig.PLATFORM in ['armcc', 'armclang']: if GetOption('target') == 'mdk5' and os.path.isfile('./lib/libstddriver_keil.lib'): libs += ['libstddriver_keil'] elif GetOption('target') == 'mdk4' and os.path.isfile('./lib/libstddriver_keil4.lib'): libs += ['libstddriver_keil4'] - elif rtconfig.CROSS_TOOL == 'gcc' and os.path.isfile('./lib/libstddriver_gcc.a'): + elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./lib/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] elif os.path.isfile('./lib/libstddriver_iar.a'): libs += ['libstddriver_iar'] diff --git a/bsp/nuvoton/libraries/m2354/Device/SConscript b/bsp/nuvoton/libraries/m2354/Device/SConscript index 07add1dc67..a823d0a380 100644 --- a/bsp/nuvoton/libraries/m2354/Device/SConscript +++ b/bsp/nuvoton/libraries/m2354/Device/SConscript @@ -11,9 +11,9 @@ Nuvoton/M2354/Source/system_M2354.c """) # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['Nuvoton/M2354/Source/GCC/startup_M2354.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['Nuvoton/M2354/Source/ARM/startup_M2354.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['Nuvoton/M2354/Source/IAR/startup_M2354.s'] diff --git a/bsp/nuvoton/libraries/m2354/StdDriver/SConscript b/bsp/nuvoton/libraries/m2354/StdDriver/SConscript index 57025d2246..c24f15f472 100644 --- a/bsp/nuvoton/libraries/m2354/StdDriver/SConscript +++ b/bsp/nuvoton/libraries/m2354/StdDriver/SConscript @@ -9,12 +9,12 @@ cpppath = [cwd + '/inc'] libpath = [cwd + '/lib'] if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): - if rtconfig.CROSS_TOOL == 'keil': + if rtconfig.PLATFORM in ['armcc', 'armclang']: if GetOption('target') == 'mdk5' and os.path.isfile('./lib/libstddriver_keil.lib'): libs += ['libstddriver_keil'] elif GetOption('target') == 'mdk4' and os.path.isfile('./lib/libstddriver_keil4.lib'): libs += ['libstddriver_keil4'] - elif rtconfig.CROSS_TOOL == 'gcc' and os.path.isfile('./lib/libstddriver_gcc.a'): + elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./lib/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] elif os.path.isfile('./lib/libstddriver_iar.a'): libs += ['libstddriver_iar'] diff --git a/bsp/nuvoton/libraries/m480/Device/SConscript b/bsp/nuvoton/libraries/m480/Device/SConscript index f86894377b..42f37b3a87 100644 --- a/bsp/nuvoton/libraries/m480/Device/SConscript +++ b/bsp/nuvoton/libraries/m480/Device/SConscript @@ -11,9 +11,9 @@ Nuvoton/M480/Source/system_M480.c """) # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['Nuvoton/M480/Source/GCC/startup_M480.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['Nuvoton/M480/Source/ARM/startup_M480.s'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['Nuvoton/M480/Source/IAR/startup_M480.s'] diff --git a/bsp/nuvoton/libraries/m480/StdDriver/SConscript b/bsp/nuvoton/libraries/m480/StdDriver/SConscript index 57025d2246..c24f15f472 100644 --- a/bsp/nuvoton/libraries/m480/StdDriver/SConscript +++ b/bsp/nuvoton/libraries/m480/StdDriver/SConscript @@ -9,12 +9,12 @@ cpppath = [cwd + '/inc'] libpath = [cwd + '/lib'] if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): - if rtconfig.CROSS_TOOL == 'keil': + if rtconfig.PLATFORM in ['armcc', 'armclang']: if GetOption('target') == 'mdk5' and os.path.isfile('./lib/libstddriver_keil.lib'): libs += ['libstddriver_keil'] elif GetOption('target') == 'mdk4' and os.path.isfile('./lib/libstddriver_keil4.lib'): libs += ['libstddriver_keil4'] - elif rtconfig.CROSS_TOOL == 'gcc' and os.path.isfile('./lib/libstddriver_gcc.a'): + elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./lib/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] elif os.path.isfile('./lib/libstddriver_iar.a'): libs += ['libstddriver_iar'] diff --git a/bsp/nuvoton/libraries/n9h30/Driver/SConscript b/bsp/nuvoton/libraries/n9h30/Driver/SConscript index dfbcad6349..f0af26837e 100644 --- a/bsp/nuvoton/libraries/n9h30/Driver/SConscript +++ b/bsp/nuvoton/libraries/n9h30/Driver/SConscript @@ -9,12 +9,12 @@ cpppath = [cwd + '/Include'] libpath = [cwd + '/Library'] if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): - if rtconfig.CROSS_TOOL == 'keil': + if rtconfig.PLATFORM in ['armcc', 'armclang']: if GetOption('target') == 'mdk4' and os.path.isfile('./Library/libstddriver_keil4.lib'): libs += ['libstddriver_keil4'] if GetOption('target') == 'mdk5' and os.path.isfile('./Library/libstddriver_keil.lib'): libs += ['libstddriver_keil'] - elif rtconfig.CROSS_TOOL == 'gcc' and os.path.isfile('./Library/libstddriver_gcc.a'): + elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./Library/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] if not libs: diff --git a/bsp/nuvoton/libraries/nuc980/Driver/SConscript b/bsp/nuvoton/libraries/nuc980/Driver/SConscript index dfbcad6349..f0af26837e 100644 --- a/bsp/nuvoton/libraries/nuc980/Driver/SConscript +++ b/bsp/nuvoton/libraries/nuc980/Driver/SConscript @@ -9,12 +9,12 @@ cpppath = [cwd + '/Include'] libpath = [cwd + '/Library'] if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): - if rtconfig.CROSS_TOOL == 'keil': + if rtconfig.PLATFORM in ['armcc', 'armclang']: if GetOption('target') == 'mdk4' and os.path.isfile('./Library/libstddriver_keil4.lib'): libs += ['libstddriver_keil4'] if GetOption('target') == 'mdk5' and os.path.isfile('./Library/libstddriver_keil.lib'): libs += ['libstddriver_keil'] - elif rtconfig.CROSS_TOOL == 'gcc' and os.path.isfile('./Library/libstddriver_gcc.a'): + elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./Library/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] if not libs: diff --git a/bsp/qemu-vexpress-gemini/cpu/SConscript b/bsp/qemu-vexpress-gemini/cpu/SConscript index 0d26b7a04b..d845dc486a 100644 --- a/bsp/qemu-vexpress-gemini/cpu/SConscript +++ b/bsp/qemu-vexpress-gemini/cpu/SConscript @@ -9,7 +9,7 @@ if rtconfig.PLATFORM == 'iar': src += Glob('*_iar.S') elif rtconfig.PLATFORM == 'gcc': src += Glob('*_gcc.S') -elif rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/samd21/sam_d2x_asflib/SConscript b/bsp/samd21/sam_d2x_asflib/SConscript index d50a1213a9..079178a9b2 100644 --- a/bsp/samd21/sam_d2x_asflib/SConscript +++ b/bsp/samd21/sam_d2x_asflib/SConscript @@ -31,18 +31,18 @@ if rtconfig.DEVICE_SERIES == 'SAMD20': path += [cwd + '/sam0/', cwd + '/sam0/utils/cmsis/samd20/include/'] path += [cwd + '/sam0/utils/cmsis/samd20/source/'] src += Glob('./sam0/utils/cmsis/samd20/source/*.c') - if rtconfig.CROSS_TOOL == 'gcc': + if rtconfig.PLATFORM == 'gcc': src += Glob('./sam0/utils/cmsis/samd20/source/gcc/*.s') - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('./sam0/utils/cmsis/samd20/source/arm/*.s') elif rtconfig.DEVICE_SERIES == 'SAMD21': #D21 path += [cwd + '/sam0/utils/cmsis/samd21/include/'] path += [cwd + '/sam0/utils/cmsis/samd21/source/'] src += Glob('./sam0/utils/cmsis/samd21/source/*.c') - if rtconfig.CROSS_TOOL == 'gcc': + if rtconfig.PLATFORM == 'gcc': src += Glob('./sam0/utils/cmsis/samd21/source/gcc/*.s') - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('./sam0/utils/cmsis/samd21/source/arm/*.s') #sam0/drivers/system diff --git a/bsp/smartfusion2/CMSIS/SConscript b/bsp/smartfusion2/CMSIS/SConscript index 653a3b7fc6..157d672a0b 100644 --- a/bsp/smartfusion2/CMSIS/SConscript +++ b/bsp/smartfusion2/CMSIS/SConscript @@ -4,10 +4,10 @@ import rtconfig cwd = GetCurrentDir() src = Glob('*.c') -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['startup_gcc/startup_m2sxxx.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup_arm/startup_m2sxxx.s'] CPPPATH = [cwd] diff --git a/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript index 032bad38b1..de50dc8411 100644 --- a/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc/startup_stm32f091xc.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/arm/startup_stm32f091xc.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/iar/startup_stm32f091xc.s'] diff --git a/bsp/stm32/libraries/templates/stm32f10x/board/SConscript b/bsp/stm32/libraries/templates/stm32f10x/board/SConscript index 713a0e4b8f..e3f1843360 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f10x/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xb.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] diff --git a/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript index b1d6966f8d..4ee71bf9dc 100644 --- a/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f207xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/arm/startup_stm32f207xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/iar/startup_stm32f207xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript index e51257b296..cbbf9b91de 100644 --- a/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/gcc/startup_stm32f302x8.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/arm/startup_stm32f302x8.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/iar/startup_stm32f302x8.s'] diff --git a/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript index 091f29472a..fd34090efc 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript index 9cd2e14341..c543f16503 100644 --- a/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript @@ -14,9 +14,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript b/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript index 86e530023b..ab03805d74 100644 --- a/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript @@ -14,9 +14,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript index e6d7e1c1e5..f014eadec6 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript @@ -21,9 +21,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32L151xb.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/arm/startup_stm32L151xb.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/iar/startup_stm32L151xb.s'] diff --git a/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript index 14352c3679..d042d99c95 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l475xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l475xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l475xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript index 96a728d057..46b55262c1 100644 --- a/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/gcc/startup_stm32l552xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/arm/startup_stm32l552xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/iar/startup_stm32l552xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript b/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript index 2a46cd7e98..0e748d6d56 100644 --- a/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript @@ -33,9 +33,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/gcc/startup_stm32mp15xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/arm/startup_stm32mp15xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/iar/startup_stm32mp15xx.s'] diff --git a/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript b/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript index 39dfe0c3ab..69fc966ade 100644 --- a/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb55xx_cm4.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb55xx_cm4.s'] diff --git a/bsp/stm32/stm32f072-st-nucleo/board/SConscript b/bsp/stm32/stm32f072-st-nucleo/board/SConscript index b1b2fc16e6..0943a47d16 100644 --- a/bsp/stm32/stm32f072-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f072-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc/startup_stm32f072xb.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/arm/startup_stm32f072xb.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/iar/startup_stm32f072xb.s'] diff --git a/bsp/stm32/stm32f091-st-nucleo/board/SConscript b/bsp/stm32/stm32f091-st-nucleo/board/SConscript index 7b8602e491..dc2ee41f5e 100644 --- a/bsp/stm32/stm32f091-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f091-st-nucleo/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc/startup_stm32f091xc.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/arm/startup_stm32f091xc.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/iar/startup_stm32f091xc.s'] diff --git a/bsp/stm32/stm32f103-atk-nano/board/SConscript b/bsp/stm32/stm32f103-atk-nano/board/SConscript index 9659e84a2b..b9247cacf5 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/SConscript +++ b/bsp/stm32/stm32f103-atk-nano/board/SConscript @@ -21,9 +21,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xb.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] diff --git a/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript b/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript index 2df6ea752e..573fcf7101 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript +++ b/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript @@ -24,9 +24,9 @@ path += [cwd + '/ports/include'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] diff --git a/bsp/stm32/stm32f103-blue-pill/board/SConscript b/bsp/stm32/stm32f103-blue-pill/board/SConscript index 713a0e4b8f..e3f1843360 100644 --- a/bsp/stm32/stm32f103-blue-pill/board/SConscript +++ b/bsp/stm32/stm32f103-blue-pill/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xb.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/SConscript b/bsp/stm32/stm32f103-dofly-M3S/board/SConscript index cd34843ab6..dcfb75afb2 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/board/SConscript +++ b/bsp/stm32/stm32f103-dofly-M3S/board/SConscript @@ -27,9 +27,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] diff --git a/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript b/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript index 713a0e4b8f..e3f1843360 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript +++ b/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xb.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] diff --git a/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript b/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript index 30d93fa3d4..42f51083a0 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript @@ -27,9 +27,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript b/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript index 713a0e4b8f..e3f1843360 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xb.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s'] diff --git a/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript b/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript index 725bb2effb..12d5420d44 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript +++ b/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript @@ -25,9 +25,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] diff --git a/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript b/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript index 0011135f6e..df4c27c291 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript +++ b/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript @@ -20,9 +20,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] diff --git a/bsp/stm32/stm32f103-yf-ufun/board/SConscript b/bsp/stm32/stm32f103-yf-ufun/board/SConscript index 0f7ccb024c..6bf641022e 100644 --- a/bsp/stm32/stm32f103-yf-ufun/board/SConscript +++ b/bsp/stm32/stm32f103-yf-ufun/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s'] diff --git a/bsp/stm32/stm32f107-uc-eval/board/SConscript b/bsp/stm32/stm32f107-uc-eval/board/SConscript index 9c24d5a97b..b2eb3d2681 100644 --- a/bsp/stm32/stm32f107-uc-eval/board/SConscript +++ b/bsp/stm32/stm32f107-uc-eval/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f107xc.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f107xc.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f107xc.s'] diff --git a/bsp/stm32/stm32f207-st-nucleo/board/SConscript b/bsp/stm32/stm32f207-st-nucleo/board/SConscript index fba49958f9..6e2bd14e56 100644 --- a/bsp/stm32/stm32f207-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f207-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Core/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f207xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/arm/startup_stm32f207xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/iar/startup_stm32f207xx.s'] diff --git a/bsp/stm32/stm32f302-st-nucleo/board/SConscript b/bsp/stm32/stm32f302-st-nucleo/board/SConscript index e51257b296..cbbf9b91de 100644 --- a/bsp/stm32/stm32f302-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f302-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/gcc/startup_stm32f302x8.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/arm/startup_stm32f302x8.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/iar/startup_stm32f302x8.s'] diff --git a/bsp/stm32/stm32f401-st-nucleo/board/SConscript b/bsp/stm32/stm32f401-st-nucleo/board/SConscript index 02b591f9a8..b618109be6 100644 --- a/bsp/stm32/stm32f401-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f401-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s'] diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript b/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript index f6d1a174f5..8cf2e2973e 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript +++ b/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s'] diff --git a/bsp/stm32/stm32f407-armfly-v5/board/SConscript b/bsp/stm32/stm32f407-armfly-v5/board/SConscript index 2528db7cee..561234a47a 100644 --- a/bsp/stm32/stm32f407-armfly-v5/board/SConscript +++ b/bsp/stm32/stm32f407-armfly-v5/board/SConscript @@ -24,9 +24,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] diff --git a/bsp/stm32/stm32f407-atk-explorer/board/SConscript b/bsp/stm32/stm32f407-atk-explorer/board/SConscript index d8b7d57bff..addf40a01f 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/SConscript +++ b/bsp/stm32/stm32f407-atk-explorer/board/SConscript @@ -38,9 +38,9 @@ if GetDepend(['BSP_USING_TOUCH']): startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] diff --git a/bsp/stm32/stm32f407-robomaster-c/board/SConscript b/bsp/stm32/stm32f407-robomaster-c/board/SConscript index 091f29472a..fd34090efc 100644 --- a/bsp/stm32/stm32f407-robomaster-c/board/SConscript +++ b/bsp/stm32/stm32f407-robomaster-c/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] diff --git a/bsp/stm32/stm32f407-st-discovery/board/SConscript b/bsp/stm32/stm32f407-st-discovery/board/SConscript index 1f5ee71ba4..8fd552cdad 100644 --- a/bsp/stm32/stm32f407-st-discovery/board/SConscript +++ b/bsp/stm32/stm32f407-st-discovery/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] diff --git a/bsp/stm32/stm32f410-st-nucleo/board/SConscript b/bsp/stm32/stm32f410-st-nucleo/board/SConscript index 9da6dc63fb..5eb2eff4bc 100644 --- a/bsp/stm32/stm32f410-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f410-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s'] diff --git a/bsp/stm32/stm32f411-atk-nano/board/SConscript b/bsp/stm32/stm32f411-atk-nano/board/SConscript index 2993a9fb6f..3669458f0d 100644 --- a/bsp/stm32/stm32f411-atk-nano/board/SConscript +++ b/bsp/stm32/stm32f411-atk-nano/board/SConscript @@ -21,9 +21,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s'] diff --git a/bsp/stm32/stm32f411-st-nucleo/board/SConscript b/bsp/stm32/stm32f411-st-nucleo/board/SConscript index 19ed8a3678..d79c31fd8d 100644 --- a/bsp/stm32/stm32f411-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f411-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s'] diff --git a/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript b/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript index 624af7a9dd..b9c207959e 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript +++ b/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s'] diff --git a/bsp/stm32/stm32f412-st-nucleo/board/SConscript b/bsp/stm32/stm32f412-st-nucleo/board/SConscript index 4cc635133f..75a677d35a 100644 --- a/bsp/stm32/stm32f412-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f412-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s'] diff --git a/bsp/stm32/stm32f413-st-nucleo/board/SConscript b/bsp/stm32/stm32f413-st-nucleo/board/SConscript index 19bd90dc16..5c964e020e 100644 --- a/bsp/stm32/stm32f413-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f413-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s'] diff --git a/bsp/stm32/stm32f427-robomaster-a/board/SConscript b/bsp/stm32/stm32f427-robomaster-a/board/SConscript index 7d5ac61de8..7443021c5e 100644 --- a/bsp/stm32/stm32f427-robomaster-a/board/SConscript +++ b/bsp/stm32/stm32f427-robomaster-a/board/SConscript @@ -21,9 +21,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s'] diff --git a/bsp/stm32/stm32f429-armfly-v6/board/SConscript b/bsp/stm32/stm32f429-armfly-v6/board/SConscript index 9a7b96b434..7ccc2fb166 100644 --- a/bsp/stm32/stm32f429-armfly-v6/board/SConscript +++ b/bsp/stm32/stm32f429-armfly-v6/board/SConscript @@ -30,9 +30,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s'] diff --git a/bsp/stm32/stm32f429-atk-apollo/board/SConscript b/bsp/stm32/stm32f429-atk-apollo/board/SConscript index de3c4b99ab..67f7b85535 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32f429-atk-apollo/board/SConscript @@ -37,9 +37,9 @@ if GetDepend(['BSP_USING_AUDIO']): startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s'] diff --git a/bsp/stm32/stm32f429-fire-challenger/board/SConscript b/bsp/stm32/stm32f429-fire-challenger/board/SConscript index 530a967740..cac1d90e57 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/SConscript +++ b/bsp/stm32/stm32f429-fire-challenger/board/SConscript @@ -27,9 +27,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s'] diff --git a/bsp/stm32/stm32f429-st-disco/board/SConscript b/bsp/stm32/stm32f429-st-disco/board/SConscript index ab2a44b57c..a6bf311a2b 100644 --- a/bsp/stm32/stm32f429-st-disco/board/SConscript +++ b/bsp/stm32/stm32f429-st-disco/board/SConscript @@ -36,9 +36,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s'] diff --git a/bsp/stm32/stm32f446-st-nucleo/board/SConscript b/bsp/stm32/stm32f446-st-nucleo/board/SConscript index 71980008cb..ce689b5e68 100644 --- a/bsp/stm32/stm32f446-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f446-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s'] diff --git a/bsp/stm32/stm32f469-st-disco/board/SConscript b/bsp/stm32/stm32f469-st-disco/board/SConscript index bd4cdf8775..03683a73e1 100644 --- a/bsp/stm32/stm32f469-st-disco/board/SConscript +++ b/bsp/stm32/stm32f469-st-disco/board/SConscript @@ -30,9 +30,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s'] diff --git a/bsp/stm32/stm32f746-st-disco/board/SConscript b/bsp/stm32/stm32f746-st-disco/board/SConscript index 8cee8fc1c4..f917aa4c8b 100644 --- a/bsp/stm32/stm32f746-st-disco/board/SConscript +++ b/bsp/stm32/stm32f746-st-disco/board/SConscript @@ -24,9 +24,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f746xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f746xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f746xx.s'] diff --git a/bsp/stm32/stm32f746-st-nucleo/board/SConscript b/bsp/stm32/stm32f746-st-nucleo/board/SConscript index 3c6a939c99..64027e4651 100644 --- a/bsp/stm32/stm32f746-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f746-st-nucleo/board/SConscript @@ -19,9 +19,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f746xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f746xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f746xx.s'] diff --git a/bsp/stm32/stm32f767-atk-apollo/board/SConscript b/bsp/stm32/stm32f767-atk-apollo/board/SConscript index 6dd2b9f997..6260edad14 100644 --- a/bsp/stm32/stm32f767-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32f767-atk-apollo/board/SConscript @@ -27,9 +27,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript b/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript index 6dd2b9f997..6260edad14 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript +++ b/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript @@ -27,9 +27,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] diff --git a/bsp/stm32/stm32f767-st-nucleo/board/SConscript b/bsp/stm32/stm32f767-st-nucleo/board/SConscript index d8f26bb030..affb7c880b 100644 --- a/bsp/stm32/stm32f767-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f767-st-nucleo/board/SConscript @@ -19,9 +19,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] diff --git a/bsp/stm32/stm32f769-st-disco/board/SConscript b/bsp/stm32/stm32f769-st-disco/board/SConscript index ae603fa187..416150abae 100644 --- a/bsp/stm32/stm32f769-st-disco/board/SConscript +++ b/bsp/stm32/stm32f769-st-disco/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] diff --git a/bsp/stm32/stm32g070-st-nucleo/board/SConscript b/bsp/stm32/stm32g070-st-nucleo/board/SConscript index 1ee2dd32b3..acbd7e22f9 100644 --- a/bsp/stm32/stm32g070-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g070-st-nucleo/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/gcc/startup_stm32g070xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/arm/startup_stm32g070xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/iar/startup_stm32g070xx.s'] diff --git a/bsp/stm32/stm32g071-st-nucleo/board/SConscript b/bsp/stm32/stm32g071-st-nucleo/board/SConscript index b5e3801062..cbf0d13e66 100644 --- a/bsp/stm32/stm32g071-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g071-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/gcc/startup_stm32g071xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: 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/Device/ST/STM32G0xx/Source/Templates/iar/startup_stm32g071xx.s'] diff --git a/bsp/stm32/stm32g431-st-nucleo/board/SConscript b/bsp/stm32/stm32g431-st-nucleo/board/SConscript index ffe023c1b2..bd65916cdb 100644 --- a/bsp/stm32/stm32g431-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g431-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g431xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/arm/startup_stm32g431xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/iar/startup_stm32g431xx.s'] diff --git a/bsp/stm32/stm32g474-st-nucleo/board/SConscript b/bsp/stm32/stm32g474-st-nucleo/board/SConscript index 9c66b20553..95ed629191 100644 --- a/bsp/stm32/stm32g474-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g474-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g474xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/arm/startup_stm32g474xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/iar/startup_stm32g474xx.s'] diff --git a/bsp/stm32/stm32h743-armfly-V7/board/SConscript b/bsp/stm32/stm32h743-armfly-V7/board/SConscript index 86e530023b..ab03805d74 100644 --- a/bsp/stm32/stm32h743-armfly-V7/board/SConscript +++ b/bsp/stm32/stm32h743-armfly-V7/board/SConscript @@ -14,9 +14,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] diff --git a/bsp/stm32/stm32h743-atk-apollo/board/SConscript b/bsp/stm32/stm32h743-atk-apollo/board/SConscript index 07cbe41b4f..5a278d4f84 100644 --- a/bsp/stm32/stm32h743-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32h743-atk-apollo/board/SConscript @@ -28,9 +28,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] diff --git a/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript b/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript index 6c95f28665..5269d23d87 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript +++ b/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript @@ -26,9 +26,9 @@ if GetDepend(['BSP_USING_OV5640']): if GetDepend(['BSP_USING_DCMI']): src += ['ports/drv_dcmi.c'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] diff --git a/bsp/stm32/stm32h743-st-nucleo/board/SConscript b/bsp/stm32/stm32h743-st-nucleo/board/SConscript index 86e530023b..ab03805d74 100644 --- a/bsp/stm32/stm32h743-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32h743-st-nucleo/board/SConscript @@ -14,9 +14,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] diff --git a/bsp/stm32/stm32h747-st-discovery/board/SConscript b/bsp/stm32/stm32h747-st-discovery/board/SConscript index 5f34d27d46..fa379359d2 100644 --- a/bsp/stm32/stm32h747-st-discovery/board/SConscript +++ b/bsp/stm32/stm32h747-st-discovery/board/SConscript @@ -14,9 +14,9 @@ path += [cwd + '/CubeMX_Config/CM7/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h747xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h747xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h747xx.s'] diff --git a/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript b/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript index 5e388d5047..6b21d2e788 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript +++ b/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript @@ -16,9 +16,9 @@ if GetDepend('BSP_USING_SPI_LCD'): path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h750xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h750xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h750xx.s'] diff --git a/bsp/stm32/stm32h750-artpi-h750/board/SConscript b/bsp/stm32/stm32h750-artpi-h750/board/SConscript index 86f194676e..baea8291cc 100644 --- a/bsp/stm32/stm32h750-artpi-h750/board/SConscript +++ b/bsp/stm32/stm32h750-artpi-h750/board/SConscript @@ -47,9 +47,9 @@ path += [cwd + '/port'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h750xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h750xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h750xx.s'] diff --git a/bsp/stm32/stm32h750-artpi-h750/board/port/wlan_wiced_lib/SConscript b/bsp/stm32/stm32h750-artpi-h750/board/port/wlan_wiced_lib/SConscript index 8dbc093043..54538df77b 100644 --- a/bsp/stm32/stm32h750-artpi-h750/board/port/wlan_wiced_lib/SConscript +++ b/bsp/stm32/stm32h750-artpi-h750/board/port/wlan_wiced_lib/SConscript @@ -8,9 +8,9 @@ LIBPATH = [] src = [] LIBPATH = [cwd] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': LIBS += ['wifi_6212_armcm7_2.1.2_gcc'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: LIBS += ['libwifi_6212_armcm7_2.1.2_armcc'] path = [cwd] diff --git a/bsp/stm32/stm32l010-st-nucleo/board/SConscript b/bsp/stm32/stm32l010-st-nucleo/board/SConscript index 74f501ff9b..dd7a705f89 100644 --- a/bsp/stm32/stm32l010-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l010-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/gcc/startup_stm32l053xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/arm/startup_stm32l053xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/iar/startup_stm32l053xx.s'] diff --git a/bsp/stm32/stm32l053-st-nucleo/board/SConscript b/bsp/stm32/stm32l053-st-nucleo/board/SConscript index 74f501ff9b..dd7a705f89 100644 --- a/bsp/stm32/stm32l053-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l053-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/gcc/startup_stm32l053xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/arm/startup_stm32l053xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/iar/startup_stm32l053xx.s'] diff --git a/bsp/stm32/stm32l412-st-nucleo/board/SConscript b/bsp/stm32/stm32l412-st-nucleo/board/SConscript index 6c39045b35..b64be60ee3 100644 --- a/bsp/stm32/stm32l412-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l412-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l412xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l412xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l412xx.s'] diff --git a/bsp/stm32/stm32l431-BearPi/board/SConscript b/bsp/stm32/stm32l431-BearPi/board/SConscript index aade0f780a..fd0771718d 100644 --- a/bsp/stm32/stm32l431-BearPi/board/SConscript +++ b/bsp/stm32/stm32l431-BearPi/board/SConscript @@ -20,9 +20,9 @@ path += [cwd + '/CubeMX_Config/Inc'] path += [cwd + '/ports/lcd'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l431xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l431xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l431xx.s'] diff --git a/bsp/stm32/stm32l432-st-nucleo/board/SConscript b/bsp/stm32/stm32l432-st-nucleo/board/SConscript index 95e0d8ecc4..2718c02f3e 100644 --- a/bsp/stm32/stm32l432-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l432-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l432xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l432xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l432xx.s'] diff --git a/bsp/stm32/stm32l433-ali-startkit/board/SConscript b/bsp/stm32/stm32l433-ali-startkit/board/SConscript index c733ccbbd0..92859a3b7c 100644 --- a/bsp/stm32/stm32l433-ali-startkit/board/SConscript +++ b/bsp/stm32/stm32l433-ali-startkit/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Core/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l433xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l433xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l433xx.s'] diff --git a/bsp/stm32/stm32l433-st-nucleo/board/SConscript b/bsp/stm32/stm32l433-st-nucleo/board/SConscript index 162a1183ef..a027978bdd 100644 --- a/bsp/stm32/stm32l433-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l433-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l433xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l433xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l433xx.s'] diff --git a/bsp/stm32/stm32l452-st-nucleo/board/SConscript b/bsp/stm32/stm32l452-st-nucleo/board/SConscript index cdc93c9ac8..d35327b32f 100644 --- a/bsp/stm32/stm32l452-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l452-st-nucleo/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l452xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l452xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l452xx.s'] diff --git a/bsp/stm32/stm32l475-atk-pandora/board/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/SConscript index 29efa41d65..085130c434 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/SConscript @@ -42,9 +42,9 @@ if GetDepend(['BSP_USING_AUDIO']): startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l475xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l475xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l475xx.s'] diff --git a/bsp/stm32/stm32l475-st-discovery/board/SConscript b/bsp/stm32/stm32l475-st-discovery/board/SConscript index 965977ad92..1f828dfff4 100644 --- a/bsp/stm32/stm32l475-st-discovery/board/SConscript +++ b/bsp/stm32/stm32l475-st-discovery/board/SConscript @@ -23,9 +23,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l475xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l475xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l475xx.s'] diff --git a/bsp/stm32/stm32l476-st-nucleo/board/SConscript b/bsp/stm32/stm32l476-st-nucleo/board/SConscript index 80eef222ac..8739a795f8 100644 --- a/bsp/stm32/stm32l476-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l476-st-nucleo/board/SConscript @@ -24,9 +24,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l476xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l476xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l476xx.s'] diff --git a/bsp/stm32/stm32l496-ali-developer/board/SConscript b/bsp/stm32/stm32l496-ali-developer/board/SConscript index 4c26186b46..fafa1c179a 100644 --- a/bsp/stm32/stm32l496-ali-developer/board/SConscript +++ b/bsp/stm32/stm32l496-ali-developer/board/SConscript @@ -24,9 +24,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l496xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l496xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l496xx.s'] diff --git a/bsp/stm32/stm32l496-st-nucleo/board/SConscript b/bsp/stm32/stm32l496-st-nucleo/board/SConscript index 8cdab7375c..b805d48a54 100644 --- a/bsp/stm32/stm32l496-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l496-st-nucleo/board/SConscript @@ -40,9 +40,9 @@ if GetDepend(['BSP_USING_AUDIO']): startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l496xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l496xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l496xx.s'] diff --git a/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript b/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript index d3f963bf27..f5db70f0cc 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l4r5xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l4r5xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l4r5xx.s'] diff --git a/bsp/stm32/stm32l4r9-st-eval/board/SConscript b/bsp/stm32/stm32l4r9-st-eval/board/SConscript index 21e3276788..c5ca6699b4 100644 --- a/bsp/stm32/stm32l4r9-st-eval/board/SConscript +++ b/bsp/stm32/stm32l4r9-st-eval/board/SConscript @@ -28,9 +28,9 @@ path += [cwd + '/ports/include'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l4r9xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l4r9xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l4r9xx.s'] diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript b/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript index ef43bfc5c0..d8b37e8f8e 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/CubeMX_Config/Core/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l4r9xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l4r9xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l4r9xx.s'] diff --git a/bsp/stm32/stm32l552-st-nucleo/board/SConscript b/bsp/stm32/stm32l552-st-nucleo/board/SConscript index 96a728d057..46b55262c1 100644 --- a/bsp/stm32/stm32l552-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l552-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/gcc/startup_stm32l552xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/arm/startup_stm32l552xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/iar/startup_stm32l552xx.s'] diff --git a/bsp/stm32/stm32mp157a-st-discovery/board/SConscript b/bsp/stm32/stm32mp157a-st-discovery/board/SConscript index f1de10714b..813b2b0734 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-discovery/board/SConscript @@ -86,9 +86,9 @@ if GetDepend(['BSP_USING_OPENAMP']): startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/gcc/startup_stm32mp15xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/arm/startup_stm32mp15xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/iar/startup_stm32mp15xx.s'] diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript index 61c1a8029c..26c2379e22 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript @@ -110,9 +110,9 @@ if GetDepend(['BSP_USING_GBE']): startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/gcc/startup_stm32mp15xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/arm/startup_stm32mp15xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/iar/startup_stm32mp15xx.s'] diff --git a/bsp/stm32/stm32u575-st-nucleo/board/SConscript b/bsp/stm32/stm32u575-st-nucleo/board/SConscript index 1a632d4758..16466feb96 100644 --- a/bsp/stm32/stm32u575-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32u575-st-nucleo/board/SConscript @@ -17,9 +17,9 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32U5xx_HAL/CMSIS/Device/ST/STM32U5xx/Source/Templates/gcc/startup_stm32u575xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32U5xx_HAL/CMSIS/Device/ST/STM32U5xx/Source/Templates/arm/startup_stm32u575xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32U5xx_HAL/CMSIS/Device/ST/STM32U5xx/Source/Templates/iar/startup_stm32u575xx.s'] diff --git a/bsp/stm32/stm32wb55-st-nucleo/board/SConscript b/bsp/stm32/stm32wb55-st-nucleo/board/SConscript index 39dfe0c3ab..69fc966ade 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32wb55-st-nucleo/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb55xx_cm4.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb55xx_cm4.s'] diff --git a/bsp/stm32/stm32wl55-st-nucleo/board/SConscript b/bsp/stm32/stm32wl55-st-nucleo/board/SConscript index a84e1c8a7d..3766c87592 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32wl55-st-nucleo/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s'] diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript b/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript index a84e1c8a7d..3766c87592 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s'] diff --git a/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript b/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript index a84e1c8a7d..3766c87592 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript @@ -18,9 +18,9 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s'] diff --git a/bsp/swm320/libraries/SConscript b/bsp/swm320/libraries/SConscript index 92c6725dce..cad5ffa0e4 100644 --- a/bsp/swm320/libraries/SConscript +++ b/bsp/swm320/libraries/SConscript @@ -6,9 +6,9 @@ CPPPATH = [cwd + '/CMSIS/CoreSupport', cwd + '/CMSIS/DeviceSupport', cwd + '/SWM src += Glob('SWM320_StdPeriph_Driver/*.c') -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['CMSIS/DeviceSupport/startup/gcc/startup_SWM320.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CMSIS/DeviceSupport/startup/arm/startup_SWM320.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['CMSIS/DeviceSupport/startup/iar/startup_SWM320.s'] diff --git a/bsp/tae32f5300/Libraries/SConscript b/bsp/tae32f5300/Libraries/SConscript index f316ba52e6..2bd9462f57 100644 --- a/bsp/tae32f5300/Libraries/SConscript +++ b/bsp/tae32f5300/Libraries/SConscript @@ -39,9 +39,9 @@ if GetDepend(['RT_USING_HWTIMER']) or GetDepend(['RT_USING_PWM'] or GetDepend([' src += ['TAE32F53xx_StdPeriph_Driver/src/tae32f53xx_ll_tmr.c'] #add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src = src + ['CMSIS/Device/Tai_action/TAE32F53xx/Source/GCC/startup_ARMCM3.S'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/Tai_action/TAE32F53xx/Source/startup_tae32f53xx.c'] elif rtconfig.CROSS_TOOL == 'iar': src = src + ['CMSIS/Device/Tai_action/TAE32F53xx/Source/IAR/startup_ARMCM3.s'] diff --git a/bsp/tm4c123bsp/board/SConscript b/bsp/tm4c123bsp/board/SConscript index 87558a20ee..2b02292d18 100644 --- a/bsp/tm4c123bsp/board/SConscript +++ b/bsp/tm4c123bsp/board/SConscript @@ -17,9 +17,9 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/TivaWare_C_series/tm4c123_driverlib/startup/gcc/startup_gcc.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/TivaWare_C_series/tm4c123_driverlib/startup/arm/startup_rvmdk.S'] elif rtconfig.CROSS_TOOL == 'iar': src += [startup_path_prefix + '/TivaWare_C_series/tm4c123_driverlib/startup/iar/startup_rvmdk.S'] @@ -27,7 +27,7 @@ elif rtconfig.CROSS_TOOL == 'iar': CPPDEFINES = ['PART_TM4C123GH6PM'] CPPDEFINES += ['TARGET_IS_TM4C123_RB1'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: CPPDEFINES += ['rvmdk'] group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) Return('group') diff --git a/bsp/tm4c129x/libraries/SConscript b/bsp/tm4c129x/libraries/SConscript index 9262cbfe87..1229898cd9 100644 --- a/bsp/tm4c129x/libraries/SConscript +++ b/bsp/tm4c129x/libraries/SConscript @@ -9,9 +9,9 @@ SrcRemove(src, 'onewire.c') CFLAGS = '' # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['startup/startup_gcc.c'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/startup_rvmdk.S'] elif rtconfig.CROSS_TOOL == 'iar': src += ['startup/startup_ewarm.c'] diff --git a/bsp/upd70f3454/drivers/SConscript b/bsp/upd70f3454/drivers/SConscript index 09e87b0cb6..f8c82bd611 100644 --- a/bsp/upd70f3454/drivers/SConscript +++ b/bsp/upd70f3454/drivers/SConscript @@ -5,7 +5,7 @@ cwd = GetCurrentDir() src_c = Glob('*.c') # add for startup script -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src_asm = ['start_gcc.S', 'vectors_gcc.S', 'interrupts_gcc.S'] elif rtconfig.CROSS_TOOL == 'iar': src_asm = ['cstartup.asm'] diff --git a/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/SConscript b/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/SConscript index d0f4543822..4dd8bd50a0 100644 --- a/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/SConscript +++ b/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/SConscript @@ -34,9 +34,9 @@ path = [ cwd + '/StdPeriph_Driver/inc'] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CMSIS/WCH/CH32F20x/Source/ARM/startup_ch32f20x.s'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['CMSIS/WCH/CH32F20x/Source/GCC/startup_ch32f20x.S'] group = DefineGroup('ch32f20x_lib', src, depend = [''], CPPPATH = path) diff --git a/bsp/wch/arm/ch32f103c8-core/board/SConscript b/bsp/wch/arm/ch32f103c8-core/board/SConscript index 5718661cdd..3f608ecc4a 100644 --- a/bsp/wch/arm/ch32f103c8-core/board/SConscript +++ b/bsp/wch/arm/ch32f103c8-core/board/SConscript @@ -15,9 +15,9 @@ board.c startup_path_prefix = SDK_LIB -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/CH32F10x_StdPeriph_Driver/CMSIS/WCH/CH32F10x/Source/ARM/startup_ch32f10x.s'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += [startup_path_prefix + '/CH32F10x_StdPeriph_Driver/CMSIS/WCH/CH32F10x/Source/GCC/startup_ch32f10x.S'] diff --git a/bsp/xplorer4330/Libraries/Device/SConscript b/bsp/xplorer4330/Libraries/Device/SConscript index 47f7e04885..fed180fd71 100644 --- a/bsp/xplorer4330/Libraries/Device/SConscript +++ b/bsp/xplorer4330/Libraries/Device/SConscript @@ -12,16 +12,16 @@ CPPDEFINES = [rtconfig.USE_CORE] CPPDEFINES += ['USE_SPIFI'] # add for startup script if rtconfig.USE_CORE =='CORE_M4': - if rtconfig.CROSS_TOOL == 'gcc': + if rtconfig.PLATFORM == 'gcc': src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx.s'] - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx.s'] else: - if rtconfig.CROSS_TOOL == 'gcc': + if rtconfig.PLATFORM == 'gcc': src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx_M0.s'] - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx_M0.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx_M0.s'] diff --git a/bsp/yichip/yc3121-pos/Libraries/SConscript b/bsp/yichip/yc3121-pos/Libraries/SConscript index 4e245383ba..e46f92324c 100644 --- a/bsp/yichip/yc3121-pos/Libraries/SConscript +++ b/bsp/yichip/yc3121-pos/Libraries/SConscript @@ -6,9 +6,9 @@ CPPPATH = [cwd + '/sdk', cwd + '/core', cwd] src += Glob('core/*.c') -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['startup/flash_start_gcc.s'] -elif rtconfig.CROSS_TOOL == 'keil': +elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/startup.s', 'startup/flash_start.s'] elif rtconfig.CROSS_TOOL == 'iar': src += ['startup/flash_start_iar.s'] diff --git a/components/libc/compilers/armlibc/SConscript b/components/libc/compilers/armlibc/SConscript index bd3ac8dffc..1d53ead4e0 100644 --- a/components/libc/compilers/armlibc/SConscript +++ b/components/libc/compilers/armlibc/SConscript @@ -6,7 +6,7 @@ group = [] CPPDEFINES = ['RT_USING_ARM_LIBC'] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: group = DefineGroup('Compiler', src, depend = [''], CPPDEFINES = CPPDEFINES) Return('group') diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index 8db8f2c94a..9c3229eb5d 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -7,7 +7,7 @@ group = [] CPPPATH = [cwd] CPPDEFINES = [] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: CPPDEFINES += ['__CLK_TCK=RT_TICK_PER_SECOND'] src += Glob('*.c') diff --git a/documentation/scons/scons.md b/documentation/scons/scons.md index 01ee8a444c..5a4d78051b 100644 --- a/documentation/scons/scons.md +++ b/documentation/scons/scons.md @@ -245,7 +245,7 @@ if GetDepend(['RT_USING_USB_DEVICE']): if GetDepend(['RT_USING_SDCARD']): src += ['drv_sdcard.c'] -if rtconfig.CROSS_TOOL == 'gcc': +if rtconfig.PLATFORM == 'gcc': src += ['gcc_startup.s'] CPPPATH = [cwd] @@ -333,7 +333,7 @@ msh_file.c ''') CPPPATH = [cwd] -if rtconfig.CROSS_TOOL == 'keil': +if rtconfig.PLATFORM in ['armcc', 'armclang']: LINKFLAGS = '--keep *.o(FSymTab)' if not GetDepend('FINSH_USING_MSH_ONLY'): diff --git a/libcpu/arm/AT91SAM7S/SConscript b/libcpu/arm/AT91SAM7S/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/AT91SAM7S/SConscript +++ b/libcpu/arm/AT91SAM7S/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/AT91SAM7X/SConscript b/libcpu/arm/AT91SAM7X/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/AT91SAM7X/SConscript +++ b/libcpu/arm/AT91SAM7X/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/am335x/SConscript b/libcpu/arm/am335x/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/am335x/SConscript +++ b/libcpu/arm/am335x/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/arm926/SConscript b/libcpu/arm/arm926/SConscript index 6b56e7aff9..ed6780b105 100644 --- a/libcpu/arm/arm926/SConscript +++ b/libcpu/arm/arm926/SConscript @@ -9,7 +9,7 @@ src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] ASFLAGS = '' -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') ASFLAGS = ' --cpreproc' diff --git a/libcpu/arm/armv6/SConscript b/libcpu/arm/armv6/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/armv6/SConscript +++ b/libcpu/arm/armv6/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/common/SConscript b/libcpu/arm/common/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/common/SConscript +++ b/libcpu/arm/common/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/cortex-a/SConscript b/libcpu/arm/cortex-a/SConscript index 64415b8f6e..e593fb3b2e 100644 --- a/libcpu/arm/cortex-a/SConscript +++ b/libcpu/arm/cortex-a/SConscript @@ -23,7 +23,7 @@ if GetDepend('RT_USING_GIC_V3'): src += ['gicv3.c'] src += ['trap.c'] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/cortex-m0/SConscript b/libcpu/arm/cortex-m0/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/cortex-m0/SConscript +++ b/libcpu/arm/cortex-m0/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/cortex-m23/SConscript b/libcpu/arm/cortex-m23/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/cortex-m23/SConscript +++ b/libcpu/arm/cortex-m23/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/cortex-m3/SConscript b/libcpu/arm/cortex-m3/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/cortex-m3/SConscript +++ b/libcpu/arm/cortex-m3/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/cortex-m33/SConscript b/libcpu/arm/cortex-m33/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/cortex-m33/SConscript +++ b/libcpu/arm/cortex-m33/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/cortex-m4/SConscript b/libcpu/arm/cortex-m4/SConscript index 75f0d9a7cc..94505d3fb6 100644 --- a/libcpu/arm/cortex-m4/SConscript +++ b/libcpu/arm/cortex-m4/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'armclang': diff --git a/libcpu/arm/cortex-m7/SConscript b/libcpu/arm/cortex-m7/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/cortex-m7/SConscript +++ b/libcpu/arm/cortex-m7/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/cortex-r4/SConscript b/libcpu/arm/cortex-r4/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/cortex-r4/SConscript +++ b/libcpu/arm/cortex-r4/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/dm36x/SConscript b/libcpu/arm/dm36x/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/dm36x/SConscript +++ b/libcpu/arm/dm36x/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/lpc214x/SConscript b/libcpu/arm/lpc214x/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/lpc214x/SConscript +++ b/libcpu/arm/lpc214x/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/lpc24xx/SConscript b/libcpu/arm/lpc24xx/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/lpc24xx/SConscript +++ b/libcpu/arm/lpc24xx/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/realview-a8-vmm/SConscript b/libcpu/arm/realview-a8-vmm/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/realview-a8-vmm/SConscript +++ b/libcpu/arm/realview-a8-vmm/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/s3c24x0/SConscript b/libcpu/arm/s3c24x0/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/s3c24x0/SConscript +++ b/libcpu/arm/s3c24x0/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/s3c44b0/SConscript b/libcpu/arm/s3c44b0/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/s3c44b0/SConscript +++ b/libcpu/arm/s3c44b0/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/sep4020/SConscript b/libcpu/arm/sep4020/SConscript index 717823339d..05f46f3c76 100644 --- a/libcpu/arm/sep4020/SConscript +++ b/libcpu/arm/sep4020/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/libcpu/arm/zynqmp-r5/SConscript b/libcpu/arm/zynqmp-r5/SConscript index 7dfe705325..61f2b51e12 100644 --- a/libcpu/arm/zynqmp-r5/SConscript +++ b/libcpu/arm/zynqmp-r5/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') if rtconfig.PLATFORM == 'gcc': diff --git a/tools/building.py b/tools/building.py index 68e70ad6a6..5cf0935474 100644 --- a/tools/building.py +++ b/tools/building.py @@ -287,7 +287,7 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ utils.ReloadModule(rtconfig) # add compability with Keil MDK 4.6 which changes the directory of armcc.exe - if rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'armclang': + if rtconfig.PLATFORM in ['armcc', 'armclang']: if rtconfig.PLATFORM == 'armcc' and not os.path.isfile(os.path.join(rtconfig.EXEC_PATH, 'armcc.exe')): if rtconfig.EXEC_PATH.find('bin40') > 0: rtconfig.EXEC_PATH = rtconfig.EXEC_PATH.replace('bin40', 'armcc/bin') diff --git a/tools/cmake.py b/tools/cmake.py index 02229556a1..eb89067914 100644 --- a/tools/cmake.py +++ b/tools/cmake.py @@ -29,7 +29,7 @@ def GenerateCFiles(env,project): SIZE = os.path.join(rtconfig.EXEC_PATH, rtconfig.SIZE).replace('\\', "/") OBJDUMP = os.path.join(rtconfig.EXEC_PATH, rtconfig.OBJDUMP).replace('\\', "/") OBJCOPY = os.path.join(rtconfig.EXEC_PATH, rtconfig.OBJCPY).replace('\\', "/") - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: FROMELF = os.path.join(rtconfig.EXEC_PATH, 'fromelf').replace('\\', "/") CFLAGS = rtconfig.CFLAGS.replace('\\', "/").replace('\"', "\\\"") @@ -51,7 +51,7 @@ def GenerateCFiles(env,project): SIZE += ".exe" OBJDUMP += ".exe" OBJCOPY += ".exe" - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: FROMELF += ".exe" if not os.path.exists(CC) or not os.path.exists(AS) or not os.path.exists(AR) or not os.path.exists(LINK): @@ -80,14 +80,14 @@ def GenerateCFiles(env,project): if rtconfig.PLATFORM == 'gcc': cm_file.write("SET(CMAKE_OBJCOPY \""+ OBJCOPY + "\")\n") cm_file.write("SET(CMAKE_SIZE \""+ SIZE + "\")\n\n") - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: cm_file.write("SET(CMAKE_FROMELF \""+ FROMELF + "\")\n\n") LINKER_FLAGS = '' LINKER_LIBS = '' if rtconfig.PLATFORM == 'gcc': LINKER_FLAGS += '-T' - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: LINKER_FLAGS += '--scatter' for group in project: if 'LIBPATH' in group.keys(): @@ -142,7 +142,7 @@ def GenerateCFiles(env,project): cm_file.write("ADD_EXECUTABLE(${CMAKE_PROJECT_NAME}.elf ${PROJECT_SOURCES})\n") cm_file.write("ADD_CUSTOM_COMMAND(TARGET ${CMAKE_PROJECT_NAME}.elf POST_BUILD \nCOMMAND ${CMAKE_OBJCOPY} -O binary ${CMAKE_PROJECT_NAME}.elf ${CMAKE_PROJECT_NAME}.bin COMMAND ${CMAKE_SIZE} ${CMAKE_PROJECT_NAME}.elf)") - elif rtconfig.CROSS_TOOL == 'keil': + elif rtconfig.PLATFORM in ['armcc', 'armclang']: cm_file.write("ADD_EXECUTABLE(${CMAKE_PROJECT_NAME} ${PROJECT_SOURCES})\n") cm_file.write("ADD_CUSTOM_COMMAND(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD \nCOMMAND ${CMAKE_FROMELF} --bin ${CMAKE_PROJECT_NAME}.elf --output ${CMAKE_PROJECT_NAME}.bin COMMAND ${CMAKE_FROMELF} -z ${CMAKE_PROJECT_NAME}.elf)") |