diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
index 4a53bd1c97e55364cf9c1ea7f6f3dcc8ff098c95..2b71fcc93cb216ea5b8ebfda81eea9d982191fe7 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
+++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript
@@ -10,13 +10,12 @@ src     += Glob('*.c')
 CPPPATH = [cwd]
 LOCAL_CCFLAGS = ''
 
-if rtconfig.CROSS_TOOL == 'gcc':
+if rtconfig.PLATFORM == 'gcc':
+    LOCAL_CCFLAGS += ' -std=c99'
+elif rtconfig.PLATFORM == 'armcc':
+    LOCAL_CCFLAGS += ' --c99'
+elif rtconfig.PLATFORM == 'armclang':
     LOCAL_CCFLAGS += ' -std=c99'
-elif rtconfig.CROSS_TOOL == 'keil':
-    if rtconfig.PLATFORM == 'armcc':
-        LOCAL_CCFLAGS += ' --c99'
-    elif rtconfig.PLATFORM == 'armclang':
-        LOCAL_CCFLAGS += ' -std=c99'
 
 group = DefineGroup('FAL', src, depend = ['PKG_USING_FAL'], CPPPATH = CPPPATH, LOCAL_CCFLAGS = LOCAL_CCFLAGS)
 
diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript
index d6cb93f7f1969ce42eab3b18c2afa662a16fe7ab..f1c2bd343d53c493261f5a615a836d4645c67bb2 100644
--- a/components/drivers/spi/SConscript
+++ b/components/drivers/spi/SConscript
@@ -25,13 +25,12 @@ if GetDepend('RT_USING_SFUD'):
     CPPPATH += [cwd + '/sfud/inc']
     if GetDepend('RT_SFUD_USING_SFDP'):
         src_device += ['sfud/src/sfud_sfdp.c']
-    if rtconfig.CROSS_TOOL == 'gcc':
+    if rtconfig.PLATFORM == 'gcc':
+        LOCAL_CCFLAGS += ' -std=c99'
+    elif rtconfig.PLATFORM == 'armcc':
+        LOCAL_CCFLAGS += ' --c99'
+    elif rtconfig.PLATFORM == 'armclang':
         LOCAL_CCFLAGS += ' -std=c99'
-    elif rtconfig.CROSS_TOOL == 'keil':
-        if rtconfig.PLATFORM == 'armcc':
-            LOCAL_CCFLAGS += ' --c99'
-        elif rtconfig.PLATFORM == 'armclang':
-            LOCAL_CCFLAGS += ' -std=c99'
 
 src += src_device