[Scons][iar][iccarm] IAR统一使用iccarm作为判断条件而不是是用IDE的名字来进行判断

因为不确定后续IAR是否会像Keil一样内含有不同的编译工具链
此外，将判断条件改为列表方式，这样更方便后续增加其他可能的IAR编译链

15 files changed, 15 insertions, 15 deletions

diff --git a/bsp/imxrt/imxrt1021-nxp-evk/SConstruct b/bsp/imxrt/imxrt1021-nxp-evk/SConstruct
index 5979f0a945..8c8f750159 100644
--- a/bsp/imxrt/imxrt1021-nxp-evk/SConstruct
+++ b/bsp/imxrt/imxrt1021-nxp-evk/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
diff --git a/bsp/imxrt/imxrt1052-atk-commander/SConstruct b/bsp/imxrt/imxrt1052-atk-commander/SConstruct
index 55ebf9d391..f7eb3c0c5e 100644
--- a/bsp/imxrt/imxrt1052-atk-commander/SConstruct
+++ b/bsp/imxrt/imxrt1052-atk-commander/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
diff --git a/bsp/imxrt/imxrt1052-fire-pro/SConstruct b/bsp/imxrt/imxrt1052-fire-pro/SConstruct
index 55ebf9d391..f7eb3c0c5e 100644
--- a/bsp/imxrt/imxrt1052-fire-pro/SConstruct
+++ b/bsp/imxrt/imxrt1052-fire-pro/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
diff --git a/bsp/imxrt/imxrt1052-nxp-evk/SConstruct b/bsp/imxrt/imxrt1052-nxp-evk/SConstruct
index 42b12299a3..b2f0587d56 100644
--- a/bsp/imxrt/imxrt1052-nxp-evk/SConstruct
+++ b/bsp/imxrt/imxrt1052-nxp-evk/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct b/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct
index 55ebf9d391..f7eb3c0c5e 100644
--- a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct
+++ b/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
diff --git a/bsp/imxrt/imxrt1060-nxp-evk/SConstruct b/bsp/imxrt/imxrt1060-nxp-evk/SConstruct
index b9be046c72..a45850ddd7 100644
--- a/bsp/imxrt/imxrt1060-nxp-evk/SConstruct
+++ b/bsp/imxrt/imxrt1060-nxp-evk/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
diff --git a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct b/bsp/imxrt/imxrt1064-nxp-evk/SConstruct
index 96668a9c4c..30ea7676b8 100644
--- a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct
+++ b/bsp/imxrt/imxrt1064-nxp-evk/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
diff --git a/bsp/imxrt/imxrt1170-nxp-evk/SConstruct b/bsp/imxrt/imxrt1170-nxp-evk/SConstruct
index 32310b0942..622d3d16f0 100644
--- a/bsp/imxrt/imxrt1170-nxp-evk/SConstruct
+++ b/bsp/imxrt/imxrt1170-nxp-evk/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
diff --git a/bsp/imxrt/libraries/MIMXRT1020/SConscript b/bsp/imxrt/libraries/MIMXRT1020/SConscript
index 812147e138..4a1a35c28b 100644
--- a/bsp/imxrt/libraries/MIMXRT1020/SConscript
+++ b/bsp/imxrt/libraries/MIMXRT1020/SConscript
@@ -14,7 +14,7 @@ if rtconfig.CROSS_TOOL == 'gcc':
     src += ['MIMXRT1021/gcc/startup_MIMXRT1021.S']
 elif rtconfig.CROSS_TOOL == 'keil':
     src += ['MIMXRT1021/arm/startup_MIMXRT1021.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += ['MIMXRT1021/iar/startup_MIMXRT1021.s']
 
 if GetDepend(['BSP_USING_GPIO']):
diff --git a/bsp/imxrt/libraries/MIMXRT1050/SConscript b/bsp/imxrt/libraries/MIMXRT1050/SConscript
index e39658fae2..cd7e682947 100644
--- a/bsp/imxrt/libraries/MIMXRT1050/SConscript
+++ b/bsp/imxrt/libraries/MIMXRT1050/SConscript
@@ -14,7 +14,7 @@ if rtconfig.PLATFORM in ['gcc']:
     src += ['MIMXRT1052/gcc/startup_MIMXRT1052.S']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src += ['MIMXRT1052/arm/startup_MIMXRT1052.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += ['MIMXRT1052/iar/startup_MIMXRT1052.s']
 
 if GetDepend(['BSP_USING_GPIO']):
diff --git a/bsp/imxrt/libraries/MIMXRT1060/SConscript b/bsp/imxrt/libraries/MIMXRT1060/SConscript
index 211adc3c83..84568cbb65 100644
--- a/bsp/imxrt/libraries/MIMXRT1060/SConscript
+++ b/bsp/imxrt/libraries/MIMXRT1060/SConscript
@@ -15,7 +15,7 @@ if rtconfig.PLATFORM in ['gcc']:
     src += ['MIMXRT1060/gcc/startup_MIMXRT1062.S']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src += ['MIMXRT1060/arm/startup_MIMXRT1062.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += ['MIMXRT1060/iar/startup_MIMXRT1062.s']
 
 if GetDepend(['BSP_USING_GPIO']):
diff --git a/bsp/imxrt/libraries/MIMXRT1064/SConscript b/bsp/imxrt/libraries/MIMXRT1064/SConscript
index 4c62bc22f2..be1b31eb08 100644
--- a/bsp/imxrt/libraries/MIMXRT1064/SConscript
+++ b/bsp/imxrt/libraries/MIMXRT1064/SConscript
@@ -14,7 +14,7 @@ if rtconfig.PLATFORM in ['gcc']:
     src += ['MIMXRT1064/gcc/startup_MIMXRT1064.S']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src += ['MIMXRT1064/arm/startup_MIMXRT1064.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += ['MIMXRT1064/iar/startup_MIMXRT1064.s']
 
 if GetDepend(['BSP_USING_GPIO']):
diff --git a/bsp/imxrt/libraries/MIMXRT1170/SConscript b/bsp/imxrt/libraries/MIMXRT1170/SConscript
index c0d93ab72b..60e27099ef 100644
--- a/bsp/imxrt/libraries/MIMXRT1170/SConscript
+++ b/bsp/imxrt/libraries/MIMXRT1170/SConscript
@@ -18,7 +18,7 @@ if rtconfig.CROSS_TOOL == 'gcc':
     src += ['MIMXRT1176/gcc/startup_MIMXRT1176_cm7.S']
 elif rtconfig.CROSS_TOOL == 'keil':
     src += ['MIMXRT1176/arm/startup_MIMXRT1176_cm7.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += ['MIMXRT1176/iar/startup_MIMXRT1176_cm7.s']
 
 if GetDepend(['BSP_USING_GPIO']):
diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct b/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct
index 923c623f17..e4b3f6c66a 100644
--- a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct
+++ b/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct b/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct
index a3f416164f..e5611ff1e6 100644
--- a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct
+++ b/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct
@@ -37,7 +37,7 @@ else:
 
 env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
 
-if rtconfig.PLATFORM == 'iar':
+if rtconfig.PLATFORM in ['iccarm']:
     env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')