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

7 files changed, 10 insertions, 10 deletions

diff --git a/bsp/imxrt/imxrt1021-nxp-evk/applications/SConscript b/bsp/imxrt/imxrt1021-nxp-evk/applications/SConscript
index ab2275a135..050054c59f 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/applications/SConscript
+++ b/bsp/imxrt/imxrt1021-nxp-evk/applications/SConscript
@@ -7,7 +7,7 @@ src = Glob('*.c')
 CPPPATH = [cwd]
 
 # add for startup script
-if rtconfig.CROSS_TOOL == 'gcc':
+if rtconfig.PLATFORM in ['gcc']:
     CPPDEFINES = ['__START=entry']
 else:
     CPPDEFINES = []
diff --git a/bsp/imxrt/imxrt1021-nxp-evk/board/SConscript b/bsp/imxrt/imxrt1021-nxp-evk/board/SConscript
index a16c5757ed..c492c8785d 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/board/SConscript
+++ b/bsp/imxrt/imxrt1021-nxp-evk/board/SConscript
@@ -14,7 +14,7 @@ CPPPATH = [cwd,cwd + '/MCUX_Config',cwd + '/ports']
 
 CPPDEFINES = ['CPU_MIMXRT1021DAG5A', 'ENDIANNESS', 'STD=C99', 'SKIP_SYSCLK_INIT', 'EVK_MCIMXRM', 'FSL_SDK_ENABLE_DRIVER_CACHE_CONTROL','XIP_EXTERNAL_FLASH=1', 'XIP_BOOT_HEADER_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/imxrt1021-nxp-evk/xip/SConscript b/bsp/imxrt/imxrt1021-nxp-evk/xip/SConscript
index 08fccdc6f4..9e02702f7d 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/xip/SConscript
+++ b/bsp/imxrt/imxrt1021-nxp-evk/xip/SConscript
@@ -7,7 +7,7 @@ if GetDepend('BSP_USING_QSPIFLASH'):
     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/imxrt1170-nxp-evk/applications/SConscript b/bsp/imxrt/imxrt1170-nxp-evk/applications/SConscript
index ab2275a135..050054c59f 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/applications/SConscript
+++ b/bsp/imxrt/imxrt1170-nxp-evk/applications/SConscript
@@ -7,7 +7,7 @@ src = Glob('*.c')
 CPPPATH = [cwd]
 
 # add for startup script
-if rtconfig.CROSS_TOOL == 'gcc':
+if rtconfig.PLATFORM in ['gcc']:
     CPPDEFINES = ['__START=entry']
 else:
     CPPDEFINES = []
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/xip/SConscript b/bsp/imxrt/imxrt1170-nxp-evk/xip/SConscript
index 65e7fefebc..84d2e8e4f8 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/xip/SConscript
+++ b/bsp/imxrt/imxrt1170-nxp-evk/xip/SConscript
@@ -7,7 +7,7 @@ if GetDepend('BSP_USING_QSPIFLASH'):
     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/MIMXRT1020/SConscript b/bsp/imxrt/libraries/MIMXRT1020/SConscript
index 4a1a35c28b..85c992a4aa 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/SConscript
+++ b/bsp/imxrt/libraries/MIMXRT1020/SConscript
@@ -10,9 +10,9 @@ src = Split('''
             MIMXRT1021/drivers/fsl_cache.c
             ''')
 
-if rtconfig.CROSS_TOOL == 'gcc':
+if rtconfig.PLATFORM in ['gcc']:
     src += ['MIMXRT1021/gcc/startup_MIMXRT1021.S']
-elif rtconfig.CROSS_TOOL == 'keil':
+elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src += ['MIMXRT1021/arm/startup_MIMXRT1021.s']
 elif rtconfig.PLATFORM in ['iccarm']:
     src += ['MIMXRT1021/iar/startup_MIMXRT1021.s']
diff --git a/bsp/imxrt/libraries/MIMXRT1170/SConscript b/bsp/imxrt/libraries/MIMXRT1170/SConscript
index c5038664d8..af8e330de5 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/SConscript
+++ b/bsp/imxrt/libraries/MIMXRT1170/SConscript
@@ -14,9 +14,9 @@ src = Split('''
             MIMXRT1176/drivers/cm7/fsl_cache.c
             ''')
 
-if rtconfig.CROSS_TOOL == 'gcc':
+if rtconfig.PLATFORM in ['gcc']:
     src += ['MIMXRT1176/gcc/startup_MIMXRT1176_cm7.S']
-elif rtconfig.CROSS_TOOL == 'keil':
+elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src += ['MIMXRT1176/arm/startup_MIMXRT1176_cm7.s']
 elif rtconfig.PLATFORM in ['iccarm']:
     src += ['MIMXRT1176/iar/startup_MIMXRT1176_cm7.s']
@@ -43,7 +43,7 @@ if GetDepend(['BSP_USING_SDIO']):
 if GetDepend(['BSP_USING_SDRAM']):
     src += ['MIMXRT1176/drivers/fsl_semc.c']
 
-if rtconfig.CROSS_TOOL == 'gcc':
+if rtconfig.PLATFORM in ['gcc']:
     group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path, ASFLAGS = '$ASFLAGS -D __STARTUP_CLEAR_BSS')
 else:
     group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path)