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

* [gcc][armcc][armclang] rtconfig.CROSS_TOOL->rtconfig.PLATFORM
2026-03-27 09:32:28 +08:00 · 2022-04-19 21:56:04 -04:00
parent 08bebb40ba
commit a0f8d43744
229 changed files with 416 additions and 416 deletions
--- 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============================')
--- 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 = [
--- 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 = [
--- 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']
--- 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']
--- 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']
--- 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']
--- 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
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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':
--- 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':
--- 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':
--- 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.
--- 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']
--- 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']
--- 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']
--- 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':

--- 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']
--- 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']
--- 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']
--- 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)
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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']
--- 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)
--- 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 = []
--- a/Show More
+++ b/Show More