[gcc][armcc][armclang] rtconfig.CROSS_TOOL->rtconfig.PLATFORM (#5802)

* [gcc][armcc][armclang] rtconfig.CROSS_TOOL->rtconfig.PLATFORM

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============================')

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 = [

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 = [

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']

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']

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']

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']

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

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']

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']

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']

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']

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']

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':

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':

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':

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.

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']

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']

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']

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':
 

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']

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']

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']

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)

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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']

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)

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 = []

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 = []

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 = []

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)'

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 = []

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 = []

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)

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)'

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 = []

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)

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)'

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)

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)

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)

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 = []

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 = []

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']

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)'

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']

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']

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)

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']

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']

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']

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']

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'):

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

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)

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']
 

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'))

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'))

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']

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 = []

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 = []

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']

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']

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']

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':

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':

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':

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']

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']

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']

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']

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']

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']

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']    

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']

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']    

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']

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']