8 files changed, 8 insertions, 8 deletions
diff --git a/bsp/microchip/samc21/SConstruct b/bsp/microchip/samc21/SConstruct
index 9f8b13d9cf..1a7569d7b8 100644
--- a/bsp/microchip/samc21/SConstruct
+++ b/bsp/microchip/samc21/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 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 rt-thread-'+ rtconfig.DEVICE_PART + '.map')
diff --git a/bsp/microchip/samc21/bsp/SConscript b/bsp/microchip/samc21/bsp/SConscript
index 10bc9ad0c1..8dd9b66e1f 100644
--- a/bsp/microchip/samc21/bsp/SConscript
+++ b/bsp/microchip/samc21/bsp/SConscript
@@ -37,7 +37,7 @@ if rtconfig.PLATFORM in ['gcc']:
 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':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += [cwd + '/samc21/iar/' + 'system_samc21.c']
     src += [cwd + '/samc21/iar/iar/' + 'startup_samc21.c']
 
diff --git a/bsp/microchip/same54/SConstruct b/bsp/microchip/same54/SConstruct
index 9f8b13d9cf..1a7569d7b8 100644
--- a/bsp/microchip/same54/SConstruct
+++ b/bsp/microchip/same54/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 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 rt-thread-'+ rtconfig.DEVICE_PART + '.map')
diff --git a/bsp/microchip/same54/bsp/SConscript b/bsp/microchip/same54/bsp/SConscript
index e2e8067592..579242efa8 100644
--- a/bsp/microchip/same54/bsp/SConscript
+++ b/bsp/microchip/same54/bsp/SConscript
@@ -41,7 +41,7 @@ if rtconfig.PLATFORM in ['gcc']:
 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':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += [cwd + '/iar/' + 'system_same54.c']
     src += [cwd + '/iar/iar/' + 'startup_same54.c']
 
diff --git a/bsp/microchip/same70/SConstruct b/bsp/microchip/same70/SConstruct
index 9f8b13d9cf..1a7569d7b8 100644
--- a/bsp/microchip/same70/SConstruct
+++ b/bsp/microchip/same70/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 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 rt-thread-'+ rtconfig.DEVICE_PART + '.map')
diff --git a/bsp/microchip/same70/bsp/SConscript b/bsp/microchip/same70/bsp/SConscript
index dc8d9d46e3..28b8d6cadc 100644
--- a/bsp/microchip/same70/bsp/SConscript
+++ b/bsp/microchip/same70/bsp/SConscript
@@ -35,7 +35,7 @@ if rtconfig.PLATFORM in ['gcc']:
 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':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += [cwd + '/same70b/iar/' + 'system_same70q21b.c']
     src += [cwd + '/same70b/iar/iar/' + 'startup_same70q21b.c']
 
diff --git a/bsp/microchip/saml10/SConstruct b/bsp/microchip/saml10/SConstruct
index 9f8b13d9cf..1a7569d7b8 100644
--- a/bsp/microchip/saml10/SConstruct
+++ b/bsp/microchip/saml10/SConstruct
@@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'],
     LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
 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 rt-thread-'+ rtconfig.DEVICE_PART + '.map')
diff --git a/bsp/microchip/saml10/bsp/SConscript b/bsp/microchip/saml10/bsp/SConscript
index 33ebccce07..54f1cdd249 100644
--- a/bsp/microchip/saml10/bsp/SConscript
+++ b/bsp/microchip/saml10/bsp/SConscript
@@ -34,7 +34,7 @@ if rtconfig.PLATFORM in ['gcc']:
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src += [cwd + '/gcc/system_saml10e16a.c']
     src += [cwd + '/gcc/gcc/startup_saml10e16a.c']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += [cwd + '/iar/system_saml10e16a.c']
     src += [cwd + '/iar/iar/startup_saml10e16a.c']