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

7 files changed, 10 insertions, 12 deletions

diff --git a/bsp/stm32/stm32f103-100ask-mini/SConstruct b/bsp/stm32/stm32f103-100ask-mini/SConstruct
index e636260b5a..870efaf708 100644
--- a/bsp/stm32/stm32f103-100ask-mini/SConstruct
+++ b/bsp/stm32/stm32f103-100ask-mini/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 $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
diff --git a/bsp/stm32/stm32f103-100ask-mini/board/SConscript b/bsp/stm32/stm32f103-100ask-mini/board/SConscript
index e88733e3f9..53480c712e 100644
--- a/bsp/stm32/stm32f103-100ask-mini/board/SConscript
+++ b/bsp/stm32/stm32f103-100ask-mini/board/SConscript
@@ -21,11 +21,11 @@ path += [cwd + '/ports']
 
 startup_path_prefix = SDK_LIB
 
-if rtconfig.PLATFORM == 'gcc':
+if rtconfig.PLATFORM in ['gcc']:
     src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xb.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xb.s']
 
 # STM32F100xB || STM32F100xE || STM32F101x6
diff --git a/bsp/stm32/stm32f103-100ask-mini/rtconfig.py b/bsp/stm32/stm32f103-100ask-mini/rtconfig.py
index b6a7baf736..afe3d54b16 100644
--- a/bsp/stm32/stm32f103-100ask-mini/rtconfig.py
+++ b/bsp/stm32/stm32f103-100ask-mini/rtconfig.py
@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil':
     PLATFORM    = 'armcc'
     EXEC_PATH   = r'C:/Keil_v5'
 elif CROSS_TOOL == 'iar':
-    PLATFORM    = 'iar'
+    PLATFORM = 'iccarm'
     EXEC_PATH   = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2'
 
 if os.getenv('RTT_EXEC_PATH'):
diff --git a/bsp/stm32/stm32f103-100ask-pro/SConstruct b/bsp/stm32/stm32f103-100ask-pro/SConstruct
index e636260b5a..870efaf708 100644
--- a/bsp/stm32/stm32f103-100ask-pro/SConstruct
+++ b/bsp/stm32/stm32f103-100ask-pro/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 $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
     env.Replace(ARFLAGS = [''])
     env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map')
diff --git a/bsp/stm32/stm32f103-100ask-pro/board/SConscript b/bsp/stm32/stm32f103-100ask-pro/board/SConscript
index 107ebd896e..8da0399bb1 100644
--- a/bsp/stm32/stm32f103-100ask-pro/board/SConscript
+++ b/bsp/stm32/stm32f103-100ask-pro/board/SConscript
@@ -21,11 +21,11 @@ path += [cwd + '/ports']
 
 startup_path_prefix = SDK_LIB
 
-if rtconfig.PLATFORM == 'gcc':
+if rtconfig.PLATFORM in ['gcc']:
     src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xe.s']
 elif rtconfig.PLATFORM in ['armcc', 'armclang']:
     src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f103xe.s']
-elif rtconfig.CROSS_TOOL == 'iar':
+elif rtconfig.PLATFORM in ['iccarm']:
     src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/iar/startup_stm32f103xe.s']
 
 # STM32F100xB || STM32F100xE || STM32F101x6
diff --git a/bsp/stm32/stm32f103-100ask-pro/rtconfig.py b/bsp/stm32/stm32f103-100ask-pro/rtconfig.py
index b6a7baf736..afe3d54b16 100644
--- a/bsp/stm32/stm32f103-100ask-pro/rtconfig.py
+++ b/bsp/stm32/stm32f103-100ask-pro/rtconfig.py
@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil':
     PLATFORM    = 'armcc'
     EXEC_PATH   = r'C:/Keil_v5'
 elif CROSS_TOOL == 'iar':
-    PLATFORM    = 'iar'
+    PLATFORM = 'iccarm'
     EXEC_PATH   = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2'
 
 if os.getenv('RTT_EXEC_PATH'):
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
index 3e6b2995f2..cee47c2d7e 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
@@ -10,12 +10,10 @@ src     += Glob('*.c')
 CPPPATH = [cwd]
 LOCAL_CFLAGS = ''
 
-if rtconfig.PLATFORM in ['gcc']:
+if rtconfig.PLATFORM in ['gcc', 'armclang']:
     LOCAL_CFLAGS += ' -std=c99'
-elif rtconfig.PLATFORM == 'armcc':
+elif rtconfig.PLATFORM in ['armcc']:
     LOCAL_CFLAGS += ' --c99'
-elif rtconfig.PLATFORM == 'armclang':
-    LOCAL_CFLAGS += ' -std=c99'
 
 group = DefineGroup('FAL', src, depend = ['RT_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CFLAGS = LOCAL_CFLAGS)