diff --git a/bsp/CME_M7/CMSIS/SConscript b/bsp/CME_M7/CMSIS/SConscript index 5cbf1f952e9..a6467b658ec 100644 --- a/bsp/CME_M7/CMSIS/SConscript +++ b/bsp/CME_M7/CMSIS/SConscript @@ -11,11 +11,11 @@ CME_M7/system_cmem7.c """) # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['CME_M7/startup/gcc/startup_CME_M7.c'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CME_M7/startup/arm/startup_cmem7.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: print('================ERROR============================') print('Not support IAR yet!') print('=================================================') diff --git a/bsp/CME_M7/SConstruct b/bsp/CME_M7/SConstruct index 4ea0c04a0b3..2a4dd7ac504 100644 --- a/bsp/CME_M7/SConstruct +++ b/bsp/CME_M7/SConstruct @@ -16,7 +16,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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) diff --git a/bsp/CME_M7/rtconfig.py b/bsp/CME_M7/rtconfig.py index 650d4bb7f89..29439a54f21 100644 --- a/bsp/CME_M7/rtconfig.py +++ b/bsp/CME_M7/rtconfig.py @@ -83,7 +83,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/Vango/v85xx/Libraries/SConscript b/bsp/Vango/v85xx/Libraries/SConscript index 18e3071c92a..1842f9190f5 100644 --- a/bsp/Vango/v85xx/Libraries/SConscript +++ b/bsp/Vango/v85xx/Libraries/SConscript @@ -13,7 +13,7 @@ src += [cwd + '/CMSIS/Vango/V85xx/Source/lib_cortex.c'] src += [cwd + '/CMSIS/Vango/V85xx/Source/lib_LoadNVR.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/CMSIS/Vango/V85xx/Source/GCC/startup_target.S'] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/Vango/V85xx/Source/Keil5/startup_target.S'] diff --git a/bsp/Vango/v85xx/SConstruct b/bsp/Vango/v85xx/SConstruct index 394f300b223..a2b6a7c8022 100644 --- a/bsp/Vango/v85xx/SConstruct +++ b/bsp/Vango/v85xx/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/Vango/v85xx/rtconfig.py b/bsp/Vango/v85xx/rtconfig.py index 8302af0cf50..9229eac3062 100644 --- a/bsp/Vango/v85xx/rtconfig.py +++ b/bsp/Vango/v85xx/rtconfig.py @@ -17,8 +17,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/Vango/v85xxp/Libraries/SConscript b/bsp/Vango/v85xxp/Libraries/SConscript index 1a3adf92870..fdca0648c6e 100644 --- a/bsp/Vango/v85xxp/Libraries/SConscript +++ b/bsp/Vango/v85xxp/Libraries/SConscript @@ -13,7 +13,7 @@ src += [cwd + '/CMSIS/Vango/V85xxP/Source/lib_cortex.c'] src += [cwd + '/CMSIS/Vango/V85xxP/Source/lib_LoadNVR.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/CMSIS/Vango/V85xxP/Source/GCC/startup_target.S'] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/Vango/V85xxP/Source/Keil5/startup_target.S'] diff --git a/bsp/Vango/v85xxp/SConstruct b/bsp/Vango/v85xxp/SConstruct index ac0a9dcd0d1..d40286eaed3 100644 --- a/bsp/Vango/v85xxp/SConstruct +++ b/bsp/Vango/v85xxp/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/Vango/v85xxp/rtconfig.py b/bsp/Vango/v85xxp/rtconfig.py index 22c83aa6ef4..5436044fc4e 100644 --- a/bsp/Vango/v85xxp/rtconfig.py +++ b/bsp/Vango/v85xxp/rtconfig.py @@ -17,8 +17,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/acm32/acm32f0x0-nucleo/SConstruct b/bsp/acm32/acm32f0x0-nucleo/SConstruct index 8886098e955..93a780e57ee 100644 --- a/bsp/acm32/acm32f0x0-nucleo/SConstruct +++ b/bsp/acm32/acm32f0x0-nucleo/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/acm32/acm32f0x0-nucleo/libraries/SConscript b/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript index 5ba7ff80123..6aed6c9004b 100644 --- a/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript +++ b/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript @@ -25,11 +25,11 @@ HAL_Driver/Src/HAL_CRC.c libpath = ['.', cwd + '/Device', cwd + '/HAL_Driver/Src'] libs = [] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['Device/Startup_ACM32F0x0_gcc.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['Device/Startup_ACM32F0x0.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['Device/Startup_ACM32F0x0_iar.s'] path = [cwd + '/HAL_Driver/Inc', diff --git a/bsp/acm32/acm32f0x0-nucleo/rtconfig.py b/bsp/acm32/acm32f0x0-nucleo/rtconfig.py index e9814d2286f..2242cd3daf5 100644 --- a/bsp/acm32/acm32f0x0-nucleo/rtconfig.py +++ b/bsp/acm32/acm32f0x0-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'D:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -94,7 +94,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/acm32/acm32f4xx-nucleo/SConstruct b/bsp/acm32/acm32f4xx-nucleo/SConstruct index 09dfa83715b..3167763f541 100644 --- a/bsp/acm32/acm32f4xx-nucleo/SConstruct +++ b/bsp/acm32/acm32f4xx-nucleo/SConstruct @@ -19,7 +19,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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript b/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript index d8d13055afe..88a351515d0 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript @@ -18,11 +18,11 @@ HAL_Driver/Src/HAL_EXTI.c libpath = ['.', cwd + '/Device', cwd + '/HAL_Driver/Src'] libs = ['System_Accelerate', 'HAL_EFlash_EX'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['Device/Startup_ACM32F4_gcc.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['Device/Startup_ACM32F4.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['Device/Startup_ACM32F4_iar.s'] path = [cwd + '/HAL_Driver/Inc', diff --git a/bsp/acm32/acm32f4xx-nucleo/rtconfig.py b/bsp/acm32/acm32f4xx-nucleo/rtconfig.py index b63b56b8783..ad5f30c5604 100644 --- a/bsp/acm32/acm32f4xx-nucleo/rtconfig.py +++ b/bsp/acm32/acm32f4xx-nucleo/rtconfig.py @@ -23,8 +23,8 @@ PLATFORM = 'armclang' EXEC_PATH = r'D:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -91,7 +91,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/airm2m/air105/SConstruct b/bsp/airm2m/air105/SConstruct index 70225dbaa62..785bf66c2a5 100644 --- a/bsp/airm2m/air105/SConstruct +++ b/bsp/airm2m/air105/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 rtthread.map') diff --git a/bsp/airm2m/air105/board/SConscript b/bsp/airm2m/air105/board/SConscript index b9745c4e6c6..42991864315 100644 --- a/bsp/airm2m/air105/board/SConscript +++ b/bsp/airm2m/air105/board/SConscript @@ -24,11 +24,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/HAL_Driver/Startup/gcc/startup_gcc.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/HAL_Driver/Startup/arm/startup_gcc.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/HAL_Driver/Startup/iar/startup_gcc.s'] group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES) diff --git a/bsp/airm2m/air105/rtconfig.py b/bsp/airm2m/air105/rtconfig.py index 18f2bdc0dcb..2b44ba29963 100644 --- a/bsp/airm2m/air105/rtconfig.py +++ b/bsp/airm2m/air105/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION += 'python ./makesoc.py' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/allwinner_tina/libcpu/SConscript b/bsp/allwinner_tina/libcpu/SConscript index aa13c2b179b..159e7889af0 100644 --- a/bsp/allwinner_tina/libcpu/SConscript +++ b/bsp/allwinner_tina/libcpu/SConscript @@ -5,7 +5,7 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_gcc.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/amebaz/SConstruct b/bsp/amebaz/SConstruct index ea5f3d64393..35a7f75de0e 100644 --- a/bsp/amebaz/SConstruct +++ b/bsp/amebaz/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/amebaz/libraries/smartconfig/SConscript b/bsp/amebaz/libraries/smartconfig/SConscript index d5d29878b28..6abfd0cfcf8 100644 --- a/bsp/amebaz/libraries/smartconfig/SConscript +++ b/bsp/amebaz/libraries/smartconfig/SConscript @@ -7,9 +7,9 @@ path = [cwd + '/inc'] libs = [''] libpath = [cwd + '/libs'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: libs += ['libsmartconfig_armcm4_gcc'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: libs += ['libsmartconfig_armcm4_iar'] group = DefineGroup('Libraries', src, depend = ['RT_USING_SMARTCONFIG_LIB'], CPPPATH = path, LIBS = libs, LIBPATH = libpath) diff --git a/bsp/amebaz/rtconfig.py b/bsp/amebaz/rtconfig.py index 86b5b955b49..ddca6749424 100644 --- a/bsp/amebaz/rtconfig.py +++ b/bsp/amebaz/rtconfig.py @@ -18,7 +18,7 @@ PLATFORM = 'gcc' EXEC_PATH = 'C:/work/env/tools/gnu_gcc/arm_gcc/mingw/bin' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.0' else: print 'Please make sure your toolchains is GNU GCC!' @@ -67,7 +67,7 @@ M_CFLAGS = CFLAGS + ' -mlong-calls -Dsourcerygxx -O0 -fPIC ' M_LFLAGS = DEVICE + ' -Wl,-z,max-page-size=0x4 -shared -fPIC -e main -nostdlib' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/apm32/apm32f103xe-minibroard/SConstruct b/bsp/apm32/apm32f103xe-minibroard/SConstruct index adca955a4eb..401ecfa0985 100644 --- a/bsp/apm32/apm32f103xe-minibroard/SConstruct +++ b/bsp/apm32/apm32f103xe-minibroard/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 rtthread.map') diff --git a/bsp/apm32/apm32f103xe-minibroard/board/SConscript b/bsp/apm32/apm32f103xe-minibroard/board/SConscript index eb181d7948e..ecf44bdd0b5 100644 --- a/bsp/apm32/apm32f103xe-minibroard/board/SConscript +++ b/bsp/apm32/apm32f103xe-minibroard/board/SConscript @@ -18,10 +18,10 @@ startup_path_prefix = SDK_LIB if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/arm/startup_apm32f10x_hd.s'] -if rtconfig.CROSS_TOOL == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/iar/startup_apm32f10x_hd.s'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/gcc/startup_apm32f10x_hd.s'] # You can select chips from the list above diff --git a/bsp/apm32/apm32f103xe-minibroard/rtconfig.py b/bsp/apm32/apm32f103xe-minibroard/rtconfig.py index 888e1566ba7..3d78c3b4b02 100644 --- a/bsp/apm32/apm32f103xe-minibroard/rtconfig.py +++ b/bsp/apm32/apm32f103xe-minibroard/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/apollo2/SConstruct b/bsp/apollo2/SConstruct index 26a793486e4..ad30eafe90e 100644 --- a/bsp/apollo2/SConstruct +++ b/bsp/apollo2/SConstruct @@ -20,7 +20,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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) diff --git a/bsp/apollo2/libraries/startup/SConscript b/bsp/apollo2/libraries/startup/SConscript index 1deac49d115..fc352aceff8 100644 --- a/bsp/apollo2/libraries/startup/SConscript +++ b/bsp/apollo2/libraries/startup/SConscript @@ -10,11 +10,11 @@ src = Split(""" """) # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['gcc/' + 'startup_gcc.c'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['arm/' + 'startup_keil.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['iar/' + 'startup_iar.c'] path = [cwd] diff --git a/bsp/asm9260t/rtconfig.py b/bsp/asm9260t/rtconfig.py index 60d4f2051a8..0c760ed17ac 100644 --- a/bsp/asm9260t/rtconfig.py +++ b/bsp/asm9260t/rtconfig.py @@ -16,8 +16,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -90,7 +90,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output ' + TARGET_NAME + ' \n' POST_ACTION += 'fromelf -z $TARGET\n' #------- IAR settings ---------------------------------------------------------- -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/at32/at32f403a-start/SConstruct b/bsp/at32/at32f403a-start/SConstruct index 2e8fe7dc960..6128df4d2d2 100644 --- a/bsp/at32/at32f403a-start/SConstruct +++ b/bsp/at32/at32f403a-start/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/at32/at32f403a-start/board/SConscript b/bsp/at32/at32f403a-start/board/SConscript index a5970038c87..1412ec8e616 100644 --- a/bsp/at32/at32f403a-start/board/SConscript +++ b/bsp/at32/at32f403a-start/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f403a_407.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f403a_407.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f403a_407.s'] CPPDEFINES = ['AT32F403AVGT7'] diff --git a/bsp/at32/at32f403a-start/rtconfig.py b/bsp/at32/at32f403a-start/rtconfig.py index 8e78aa373b8..b542aa27e37 100644 --- a/bsp/at32/at32f403a-start/rtconfig.py +++ b/bsp/at32/at32f403a-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/at32/at32f407-start/SConstruct b/bsp/at32/at32f407-start/SConstruct index 2e8fe7dc960..6128df4d2d2 100644 --- a/bsp/at32/at32f407-start/SConstruct +++ b/bsp/at32/at32f407-start/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/at32/at32f407-start/board/SConscript b/bsp/at32/at32f407-start/board/SConscript index 66967ab0eb6..82e1ad7c83c 100644 --- a/bsp/at32/at32f407-start/board/SConscript +++ b/bsp/at32/at32f407-start/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f403a_407.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f403a_407.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/AT32F403A_407_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f403a_407.s'] CPPDEFINES = ['AT32F407VGT7'] diff --git a/bsp/at32/at32f407-start/rtconfig.py b/bsp/at32/at32f407-start/rtconfig.py index 8e78aa373b8..b542aa27e37 100644 --- a/bsp/at32/at32f407-start/rtconfig.py +++ b/bsp/at32/at32f407-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/at32/at32f413-start/SConstruct b/bsp/at32/at32f413-start/SConstruct index 01bab30749b..188f212186c 100644 --- a/bsp/at32/at32f413-start/SConstruct +++ b/bsp/at32/at32f413-start/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/at32/at32f413-start/board/SConscript b/bsp/at32/at32f413-start/board/SConscript index 51fe4c11aac..57b467f6cc5 100644 --- a/bsp/at32/at32f413-start/board/SConscript +++ b/bsp/at32/at32f413-start/board/SConscript @@ -21,7 +21,7 @@ if rtconfig.CROSS_TOOL == 'gcc': src += [startup_path_prefix + '/AT32F413_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f413.s'] elif rtconfig.CROSS_TOOL == 'keil': src += [startup_path_prefix + '/AT32F413_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f413.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/AT32F413_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f413.s'] CPPDEFINES = ['AT32F413RCT7'] diff --git a/bsp/at32/at32f413-start/rtconfig.py b/bsp/at32/at32f413-start/rtconfig.py index 8e78aa373b8..b542aa27e37 100644 --- a/bsp/at32/at32f413-start/rtconfig.py +++ b/bsp/at32/at32f413-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/at32/at32f415-start/SConstruct b/bsp/at32/at32f415-start/SConstruct index 10eac9bc85e..25ab5b6f2d1 100644 --- a/bsp/at32/at32f415-start/SConstruct +++ b/bsp/at32/at32f415-start/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/at32/at32f415-start/board/SConscript b/bsp/at32/at32f415-start/board/SConscript index 47bfecd047b..1845cbcce1b 100644 --- a/bsp/at32/at32f415-start/board/SConscript +++ b/bsp/at32/at32f415-start/board/SConscript @@ -21,7 +21,7 @@ if rtconfig.CROSS_TOOL == 'gcc': src += [startup_path_prefix + '/AT32F415_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f415.s'] elif rtconfig.CROSS_TOOL == 'keil': src += [startup_path_prefix + '/AT32F415_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f415.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/AT32F415_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f415.s'] CPPDEFINES = ['AT32F415RCT7'] diff --git a/bsp/at32/at32f415-start/rtconfig.py b/bsp/at32/at32f415-start/rtconfig.py index f9cad296fb8..54265a30af8 100644 --- a/bsp/at32/at32f415-start/rtconfig.py +++ b/bsp/at32/at32f415-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/at32/at32f435-start/SConstruct b/bsp/at32/at32f435-start/SConstruct index 3cc2879e44e..08b2117a9ba 100644 --- a/bsp/at32/at32f435-start/SConstruct +++ b/bsp/at32/at32f435-start/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/at32/at32f435-start/board/SConscript b/bsp/at32/at32f435-start/board/SConscript index 8bdc2088076..9ef9f730dcb 100644 --- a/bsp/at32/at32f435-start/board/SConscript +++ b/bsp/at32/at32f435-start/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f435_437.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f435_437.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f435_437.s'] CPPDEFINES = ['AT32F435ZMT7'] diff --git a/bsp/at32/at32f435-start/rtconfig.py b/bsp/at32/at32f435-start/rtconfig.py index 8e78aa373b8..b542aa27e37 100644 --- a/bsp/at32/at32f435-start/rtconfig.py +++ b/bsp/at32/at32f435-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/at32/at32f437-start/SConstruct b/bsp/at32/at32f437-start/SConstruct index 3cc2879e44e..08b2117a9ba 100644 --- a/bsp/at32/at32f437-start/SConstruct +++ b/bsp/at32/at32f437-start/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/at32/at32f437-start/board/SConscript b/bsp/at32/at32f437-start/board/SConscript index dd39194f5f6..cb9ea80bbd0 100644 --- a/bsp/at32/at32f437-start/board/SConscript +++ b/bsp/at32/at32f437-start/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/gcc/startup_at32f435_437.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/mdk/startup_at32f435_437.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/AT32F435_437_Firmware_Library/cmsis/cm4/device_support/startup/iar/startup_at32f435_437.s'] CPPDEFINES = ['AT32F437ZMT7'] diff --git a/bsp/at32/at32f437-start/rtconfig.py b/bsp/at32/at32f437-start/rtconfig.py index 8e78aa373b8..b542aa27e37 100644 --- a/bsp/at32/at32f437-start/rtconfig.py +++ b/bsp/at32/at32f437-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/at91/at91sam9260/platform/SConscript b/bsp/at91/at91sam9260/platform/SConscript index f984f7d7739..6604d06ef98 100644 --- a/bsp/at91/at91sam9260/platform/SConscript +++ b/bsp/at91/at91sam9260/platform/SConscript @@ -9,10 +9,10 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src = Glob('*.c') + Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = Glob('*.c') + Glob('*_gcc.S') + Glob('*_init.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src = Glob('*.c') + Glob('*_iar.S') if rtconfig.PLATFORM == 'cl': diff --git a/bsp/at91/at91sam9260/rtconfig.py b/bsp/at91/at91sam9260/rtconfig.py index da3be0fd59b..309ebac4d3f 100644 --- a/bsp/at91/at91sam9260/rtconfig.py +++ b/bsp/at91/at91sam9260/rtconfig.py @@ -15,7 +15,7 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' if os.getenv('RTT_EXEC_PATH'): diff --git a/bsp/at91/at91sam9g45/platform/SConscript b/bsp/at91/at91sam9g45/platform/SConscript index f984f7d7739..6604d06ef98 100644 --- a/bsp/at91/at91sam9g45/platform/SConscript +++ b/bsp/at91/at91sam9g45/platform/SConscript @@ -9,10 +9,10 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src = Glob('*.c') + Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = Glob('*.c') + Glob('*_gcc.S') + Glob('*_init.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src = Glob('*.c') + Glob('*_iar.S') if rtconfig.PLATFORM == 'cl': diff --git a/bsp/at91/at91sam9g45/rtconfig.py b/bsp/at91/at91sam9g45/rtconfig.py index bd29b56f4f2..254d2c39253 100644 --- a/bsp/at91/at91sam9g45/rtconfig.py +++ b/bsp/at91/at91sam9g45/rtconfig.py @@ -15,7 +15,7 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' if os.getenv('RTT_EXEC_PATH'): @@ -89,7 +89,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output ' + TARGET_NAME + ' \n' POST_ACTION += 'fromelf -z $TARGET\n' #------- IAR settings ---------------------------------------------------------- -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/bluetrum/libcpu/cpu/SConscript b/bsp/bluetrum/libcpu/cpu/SConscript index 61f2b51e125..a98862a8483 100644 --- a/bsp/bluetrum/libcpu/cpu/SConscript +++ b/bsp/bluetrum/libcpu/cpu/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/dm365/rtconfig.py b/bsp/dm365/rtconfig.py index 0b699be2eb3..22601f00d38 100644 --- a/bsp/dm365/rtconfig.py +++ b/bsp/dm365/rtconfig.py @@ -72,7 +72,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'armcc' AS = 'armasm' diff --git a/bsp/efm32/Libraries/SConscript b/bsp/efm32/Libraries/SConscript index a45486a3e0b..521fc667588 100644 --- a/bsp/efm32/Libraries/SConscript +++ b/bsp/efm32/Libraries/SConscript @@ -4,7 +4,7 @@ from building import * # get current directory cwd = GetCurrentDir() -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: compiler = 'GCC' # The set of source files associated with this SConscript file. diff --git a/bsp/efm32/SConscript b/bsp/efm32/SConscript index 55adf12d6ba..b1254300ca2 100644 --- a/bsp/efm32/SConscript +++ b/bsp/efm32/SConscript @@ -3,7 +3,7 @@ Import('RTT_ROOT') from building import * src_bsp = ['application.c', 'startup.c', 'board.c'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src_bsp.append('start_gcc.S') src_drv1 = ['drv_emu.c', 'drv_dma.c', 'drv_rtc.c', 'drv_adc.c', 'drv_acmp.c', 'drv_usart.c', 'drv_leuart.c', 'drv_iic.c', 'drv_timer.c'] src_drv2 = ['drv_sdcard.c', 'drv_ethernet.c'] diff --git a/bsp/essemi/es32f0654/SConstruct b/bsp/essemi/es32f0654/SConstruct index 232c6fca615..615a67aadc7 100644 --- a/bsp/essemi/es32f0654/SConstruct +++ b/bsp/essemi/es32f0654/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/essemi/es32f0654/libraries/SConscript b/bsp/essemi/es32f0654/libraries/SConscript index fc865183a71..312b5e8bb8b 100644 --- a/bsp/essemi/es32f0654/libraries/SConscript +++ b/bsp/essemi/es32f0654/libraries/SConscript @@ -11,11 +11,11 @@ src = [] src += Glob('ES32F065x_ALD_StdPeriph_Driver/Source/*.c') #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['CMSIS/Device/EastSoft/ES32F065x/Startup/gcc/startup_es32f065x.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/EastSoft/ES32F065x/Startup/keil/startup_es32f065x.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['CMSIS/Device/EastSoft/ES32F065x/Startup/iar/startup_es32f065x.s'] path = [cwd + '/CMSIS/Device/EastSoft/ES32F065x/Include', diff --git a/bsp/essemi/es32f0654/rtconfig.py b/bsp/essemi/es32f0654/rtconfig.py index ed0d5930f08..3a2f6a22c04 100644 --- a/bsp/essemi/es32f0654/rtconfig.py +++ b/bsp/essemi/es32f0654/rtconfig.py @@ -22,7 +22,7 @@ EXEC_PATH = r'C:/Keil' elif CROSS_TOOL == 'iar': # not support iar yet - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/IAR' if os.getenv('RTT_EXEC_PATH'): @@ -87,7 +87,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/essemi/es32f365x/SConstruct b/bsp/essemi/es32f365x/SConstruct index 5749424b99d..3b0fad6deb7 100644 --- a/bsp/essemi/es32f365x/SConstruct +++ b/bsp/essemi/es32f365x/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/essemi/es32f365x/rtconfig.py b/bsp/essemi/es32f365x/rtconfig.py index 133aa4372e7..001fc474a57 100644 --- a/bsp/essemi/es32f365x/rtconfig.py +++ b/bsp/essemi/es32f365x/rtconfig.py @@ -22,7 +22,7 @@ EXEC_PATH = r'C:/Keil' elif CROSS_TOOL == 'iar': # not support iar yet - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/IAR' if os.getenv('RTT_EXEC_PATH'): @@ -87,7 +87,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/essemi/es32f369x/SConstruct b/bsp/essemi/es32f369x/SConstruct index 232c6fca615..615a67aadc7 100644 --- a/bsp/essemi/es32f369x/SConstruct +++ b/bsp/essemi/es32f369x/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/essemi/es32f369x/libraries/SConscript b/bsp/essemi/es32f369x/libraries/SConscript index 31284a848d1..bfac4db471d 100644 --- a/bsp/essemi/es32f369x/libraries/SConscript +++ b/bsp/essemi/es32f369x/libraries/SConscript @@ -11,11 +11,11 @@ src = [] src += Glob('ES32F36xx_ALD_StdPeriph_Driver/Source/*.c') #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['CMSIS/Device/EastSoft/ES32F36xx/Startup/gcc/startup_es32f36xx.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/EastSoft/ES32F36xx/Startup/keil/startup_es32f36xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['CMSIS/Device/EastSoft/ES32F36xx/Startup/iar/startup_es32f36xx.s'] path = [cwd + '/CMSIS/Device/EastSoft/ES32F36xx/Include', diff --git a/bsp/essemi/es32f369x/rtconfig.py b/bsp/essemi/es32f369x/rtconfig.py index 133aa4372e7..001fc474a57 100644 --- a/bsp/essemi/es32f369x/rtconfig.py +++ b/bsp/essemi/es32f369x/rtconfig.py @@ -22,7 +22,7 @@ EXEC_PATH = r'C:/Keil' elif CROSS_TOOL == 'iar': # not support iar yet - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/IAR' if os.getenv('RTT_EXEC_PATH'): @@ -87,7 +87,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/fm33lc026/SConstruct b/bsp/fm33lc026/SConstruct index 79fc1d0f6f1..f0e4bc44a4a 100644 --- a/bsp/fm33lc026/SConstruct +++ b/bsp/fm33lc026/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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map']) diff --git a/bsp/fm33lc026/board/SConscript b/bsp/fm33lc026/board/SConscript index 099adce14d7..065f1e5abd6 100644 --- a/bsp/fm33lc026/board/SConscript +++ b/bsp/fm33lc026/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/FM/FM33xx/Source/Templates/gcc/startup_fm33lc0xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/FM/FM33xx/Source/Templates/ARM/startup_fm33lc0xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/FM/FM33xx/Source/Templates/iar/startup_fm33lc0xx.s'] # FM33LC0XX diff --git a/bsp/fm33lc026/rtconfig.py b/bsp/fm33lc026/rtconfig.py index 00c8bc74131..19cd2904043 100644 --- a/bsp/fm33lc026/rtconfig.py +++ b/bsp/fm33lc026/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/frdm-k64f/SConstruct b/bsp/frdm-k64f/SConstruct index 492622db793..8e5bb673746 100644 --- a/bsp/frdm-k64f/SConstruct +++ b/bsp/frdm-k64f/SConstruct @@ -20,7 +20,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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) diff --git a/bsp/frdm-k64f/device/SConscript b/bsp/frdm-k64f/device/SConscript index 957b670b0ee..d8d9790bb2c 100644 --- a/bsp/frdm-k64f/device/SConscript +++ b/bsp/frdm-k64f/device/SConscript @@ -11,13 +11,13 @@ src = Glob('MK64F12/*.c') src += ['system_MK64F12.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['TOOLCHAIN_GCC_ARM/startup_MK64F12.S'] src = src + ['TOOLCHAIN_GCC_ARM/startup.c'] path += [cwd + 'TOOLCHAIN_GCC_ARM'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['TOOLCHAIN_ARM_STD/startup_MK64F12.s'] -# elif rtconfig.CROSS_TOOL == 'iar': +# elif rtconfig.PLATFORM in ['iccarm']: CPPDEFINES = ['CPU_MK64FN1M0VLL12'] diff --git a/bsp/ft32/ft32f072xb-starter/SConstruct b/bsp/ft32/ft32f072xb-starter/SConstruct index 0c05aad12c1..12634e699d7 100644 --- a/bsp/ft32/ft32f072xb-starter/SConstruct +++ b/bsp/ft32/ft32f072xb-starter/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/ft32/ft32f072xb-starter/board/SConscript b/bsp/ft32/ft32f072xb-starter/board/SConscript index 6366633b296..866799a6bb9 100644 --- a/bsp/ft32/ft32f072xb-starter/board/SConscript +++ b/bsp/ft32/ft32f072xb-starter/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/FT32F0xx/CMSIS/FT32F0xx/source/gcc/startup_ft32f072xb.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/FT32F0xx/CMSIS/FT32F0xx/source/arm/startup_ft32f072xb.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/FT32F0xx/CMSIS/FT32F0xx/source/iar/startup_ft32f072xb.s'] # FT32F072x8 || FT32F072xB diff --git a/bsp/ft32/ft32f072xb-starter/rtconfig.py b/bsp/ft32/ft32f072xb-starter/rtconfig.py index daaefbe30a5..9818b62f9d8 100644 --- a/bsp/ft32/ft32f072xb-starter/rtconfig.py +++ b/bsp/ft32/ft32f072xb-starter/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript b/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript index 6c7e1add38f..dd86cc6abad 100644 --- a/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript @@ -5,11 +5,11 @@ from building import * src = Glob('*.c') # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['start_gcc.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['start_rvds.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['start_iar.S'] CPPPATH = [GetCurrentDir()] diff --git a/bsp/fujitsu/mb9x/mb9bf500r/SConstruct b/bsp/fujitsu/mb9x/mb9bf500r/SConstruct index 5b6608b3532..9d9ed87ca85 100644 --- a/bsp/fujitsu/mb9x/mb9bf500r/SConstruct +++ b/bsp/fujitsu/mb9x/mb9bf500r/SConstruct @@ -20,7 +20,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 project.map') diff --git a/bsp/fujitsu/mb9x/mb9bf500r/rtconfig.py b/bsp/fujitsu/mb9x/mb9bf500r/rtconfig.py index 24ae26d0ab1..a6a5180fc75 100644 --- a/bsp/fujitsu/mb9x/mb9bf500r/rtconfig.py +++ b/bsp/fujitsu/mb9x/mb9bf500r/rtconfig.py @@ -82,7 +82,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/fujitsu/mb9x/mb9bf506r/SConstruct b/bsp/fujitsu/mb9x/mb9bf506r/SConstruct index 83fa4a0ca97..c230d6ed5fe 100644 --- a/bsp/fujitsu/mb9x/mb9bf506r/SConstruct +++ b/bsp/fujitsu/mb9x/mb9bf506r/SConstruct @@ -20,7 +20,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 project.map') diff --git a/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript b/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript index 7abee895195..2799cefa6bf 100644 --- a/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript @@ -7,11 +7,11 @@ src = Glob('*.c') src = ['Device/FUJISTU/MB9BF50x/Source/system_mb9bf50x.c'] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['Device/FUJISTU/MB9BF50x/Source/G++/startup_mb9bf50x.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['Device/FUJISTU/MB9BF50x/Source/ARM/startup_mb9bf50x.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['Device/FUJISTU/MB9BF50x/Source/IAR/startup_mb9bf50x.S'] CPPPATH = [cwd + '/Device/FUJISTU/MB9BF50x/Include'] diff --git a/bsp/fujitsu/mb9x/mb9bf506r/rtconfig.py b/bsp/fujitsu/mb9x/mb9bf506r/rtconfig.py index d8b525f291f..8114941fda4 100644 --- a/bsp/fujitsu/mb9x/mb9bf506r/rtconfig.py +++ b/bsp/fujitsu/mb9x/mb9bf506r/rtconfig.py @@ -18,7 +18,7 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation' if os.getenv('RTT_EXEC_PATH'): @@ -79,7 +79,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/fujitsu/mb9x/mb9bf568r/CMSIS/SConscript b/bsp/fujitsu/mb9x/mb9bf568r/CMSIS/SConscript index 4e888d2a7c4..7af796f38a3 100644 --- a/bsp/fujitsu/mb9x/mb9bf568r/CMSIS/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf568r/CMSIS/SConscript @@ -11,7 +11,7 @@ CPPPATH = [cwd + '/Include', cwd + '/DeviceSupport'] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['DeviceSupport/arm/startup_mb9bf56xr.s'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['DeviceSupport/gcc/startup_mb9bf56xr.S'] group = DefineGroup('CMSIS', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/fujitsu/mb9x/mb9bf568r/SConstruct b/bsp/fujitsu/mb9x/mb9bf568r/SConstruct index d8380c4595f..67eeafa3d12 100644 --- a/bsp/fujitsu/mb9x/mb9bf568r/SConstruct +++ b/bsp/fujitsu/mb9x/mb9bf568r/SConstruct @@ -21,7 +21,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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) diff --git a/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript b/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript index d40b425c58c..940078d2e30 100644 --- a/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript @@ -8,11 +8,11 @@ src = Glob('DeviceSupport/fujitsu/mb9bf61x/*.c') CPPPATH = [cwd + '/Include', cwd + '/DeviceSupport/fujitsu/mb9bf61x/'] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['DeviceSupport/fujitsu/mb9bf61x/startup/gcc/startup_mb9bf61x.c'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['DeviceSupport/fujitsu/mb9bf61x/startup/arm/startup_mb9bf61x.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['DeviceSupport/fujitsu/mb9bf61x/startup/iar/startup_mb9bf61x.S'] CPPDEFINES = [rtconfig.FM3_TYPE] diff --git a/bsp/fujitsu/mb9x/mb9bf618s/SConstruct b/bsp/fujitsu/mb9x/mb9bf618s/SConstruct index 83fa4a0ca97..c230d6ed5fe 100644 --- a/bsp/fujitsu/mb9x/mb9bf618s/SConstruct +++ b/bsp/fujitsu/mb9x/mb9bf618s/SConstruct @@ -20,7 +20,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 project.map') diff --git a/bsp/fujitsu/mb9x/mb9bf618s/rtconfig.py b/bsp/fujitsu/mb9x/mb9bf618s/rtconfig.py index 474ff3dd57a..ca1942a11ad 100644 --- a/bsp/fujitsu/mb9x/mb9bf618s/rtconfig.py +++ b/bsp/fujitsu/mb9x/mb9bf618s/rtconfig.py @@ -23,7 +23,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'E:/Keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:\Program Files\IAR Systems\Embedded Workbench 6.0 Evaluation' if os.getenv('RTT_EXEC_PATH'): @@ -84,7 +84,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git "a/bsp/gd32/docs/GD32\347\263\273\345\210\227BSP\345\210\266\344\275\234\346\225\231\347\250\213.md" "b/bsp/gd32/docs/GD32\347\263\273\345\210\227BSP\345\210\266\344\275\234\346\225\231\347\250\213.md" index 6607aa335d1..03c7764741f 100644 --- "a/bsp/gd32/docs/GD32\347\263\273\345\210\227BSP\345\210\266\344\275\234\346\225\231\347\250\213.md" +++ "b/bsp/gd32/docs/GD32\347\263\273\345\210\227BSP\345\210\266\344\275\234\346\225\231\347\250\213.md" @@ -151,7 +151,7 @@ env = Environment(tools = ['mingw'], LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM == '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/gd32/gd32103c-eval/SConstruct b/bsp/gd32/gd32103c-eval/SConstruct index 49074397d0a..4ae47cd02fc 100644 --- a/bsp/gd32/gd32103c-eval/SConstruct +++ b/bsp/gd32/gd32103c-eval/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 rtthread.map') diff --git a/bsp/gd32/gd32103c-eval/board/SConscript b/bsp/gd32/gd32103c-eval/board/SConscript index 45487fdb9e1..0762046a90f 100644 --- a/bsp/gd32/gd32103c-eval/board/SConscript +++ b/bsp/gd32/gd32103c-eval/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_hd.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_hd.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_hd.s'] CPPDEFINES = ['GD32F10X_HD'] diff --git a/bsp/gd32/gd32103c-eval/rtconfig.py b/bsp/gd32/gd32103c-eval/rtconfig.py index 4285e6b03cb..a8cb7dc4673 100644 --- a/bsp/gd32/gd32103c-eval/rtconfig.py +++ b/bsp/gd32/gd32103c-eval/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32/gd32105c-eval/SConstruct b/bsp/gd32/gd32105c-eval/SConstruct index 49074397d0a..4ae47cd02fc 100644 --- a/bsp/gd32/gd32105c-eval/SConstruct +++ b/bsp/gd32/gd32105c-eval/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 rtthread.map') diff --git a/bsp/gd32/gd32105c-eval/board/SConscript b/bsp/gd32/gd32105c-eval/board/SConscript index ad9aaef370a..a85b0a42ae0 100644 --- a/bsp/gd32/gd32105c-eval/board/SConscript +++ b/bsp/gd32/gd32105c-eval/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] CPPDEFINES = ['GD32F10X_CL'] diff --git a/bsp/gd32/gd32105c-eval/rtconfig.py b/bsp/gd32/gd32105c-eval/rtconfig.py index 4285e6b03cb..a8cb7dc4673 100644 --- a/bsp/gd32/gd32105c-eval/rtconfig.py +++ b/bsp/gd32/gd32105c-eval/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32/gd32105r-start/SConstruct b/bsp/gd32/gd32105r-start/SConstruct index 49074397d0a..4ae47cd02fc 100644 --- a/bsp/gd32/gd32105r-start/SConstruct +++ b/bsp/gd32/gd32105r-start/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 rtthread.map') diff --git a/bsp/gd32/gd32105r-start/board/SConscript b/bsp/gd32/gd32105r-start/board/SConscript index ad9aaef370a..a85b0a42ae0 100644 --- a/bsp/gd32/gd32105r-start/board/SConscript +++ b/bsp/gd32/gd32105r-start/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] CPPDEFINES = ['GD32F10X_CL'] diff --git a/bsp/gd32/gd32105r-start/rtconfig.py b/bsp/gd32/gd32105r-start/rtconfig.py index 1839e540bff..c28bbfc9dc4 100644 --- a/bsp/gd32/gd32105r-start/rtconfig.py +++ b/bsp/gd32/gd32105r-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32/gd32107c-eval/SConstruct b/bsp/gd32/gd32107c-eval/SConstruct index 49074397d0a..4ae47cd02fc 100644 --- a/bsp/gd32/gd32107c-eval/SConstruct +++ b/bsp/gd32/gd32107c-eval/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 rtthread.map') diff --git a/bsp/gd32/gd32107c-eval/board/SConscript b/bsp/gd32/gd32107c-eval/board/SConscript index ad9aaef370a..a85b0a42ae0 100644 --- a/bsp/gd32/gd32107c-eval/board/SConscript +++ b/bsp/gd32/gd32107c-eval/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F10x_Firmware_Library/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] CPPDEFINES = ['GD32F10X_CL'] diff --git a/bsp/gd32/gd32107c-eval/rtconfig.py b/bsp/gd32/gd32107c-eval/rtconfig.py index 4285e6b03cb..a8cb7dc4673 100644 --- a/bsp/gd32/gd32107c-eval/rtconfig.py +++ b/bsp/gd32/gd32107c-eval/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32/gd32205r-start/SConstruct b/bsp/gd32/gd32205r-start/SConstruct index 14ab8b82ea0..9a8dd0f14d8 100644 --- a/bsp/gd32/gd32205r-start/SConstruct +++ b/bsp/gd32/gd32205r-start/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 rtthread.map') diff --git a/bsp/gd32/gd32205r-start/board/SConscript b/bsp/gd32/gd32205r-start/board/SConscript index 87645eb78af..e3e280f6ae8 100644 --- a/bsp/gd32/gd32205r-start/board/SConscript +++ b/bsp/gd32/gd32205r-start/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F20x_Firmware_Library/CMSIS/GD/GD32F20x/Source/GCC/startup_gd32f20x_cl.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F20x_Firmware_Library/CMSIS/GD/GD32F20x/Source/ARM/startup_gd32f20x_cl.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F20x_Firmware_Library/CMSIS/GD/GD32F20x/Source/IAR/startup_gd32f20x_cl.s'] CPPDEFINES = ['GD32F20X_CL'] diff --git a/bsp/gd32/gd32205r-start/rtconfig.py b/bsp/gd32/gd32205r-start/rtconfig.py index 4285e6b03cb..a8cb7dc4673 100644 --- a/bsp/gd32/gd32205r-start/rtconfig.py +++ b/bsp/gd32/gd32205r-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32/gd32303e-eval/SConstruct b/bsp/gd32/gd32303e-eval/SConstruct index f32e96f6246..d733bb923db 100644 --- a/bsp/gd32/gd32303e-eval/SConstruct +++ b/bsp/gd32/gd32303e-eval/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 rtthread.map') diff --git a/bsp/gd32/gd32303e-eval/board/SConscript b/bsp/gd32/gd32303e-eval/board/SConscript index d023a96a2ff..4952e20f508 100644 --- a/bsp/gd32/gd32303e-eval/board/SConscript +++ b/bsp/gd32/gd32303e-eval/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/GCC/startup_gd32f30x_hd.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/ARM/startup_gd32f30x_hd.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/IAR/startup_gd32f30x_hd.s'] CPPDEFINES = ['GD32F30X_HD'] diff --git a/bsp/gd32/gd32303e-eval/rtconfig.py b/bsp/gd32/gd32303e-eval/rtconfig.py index a91905a233a..2075890edf1 100644 --- a/bsp/gd32/gd32303e-eval/rtconfig.py +++ b/bsp/gd32/gd32303e-eval/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32/gd32305r-start/SConstruct b/bsp/gd32/gd32305r-start/SConstruct index f32e96f6246..d733bb923db 100644 --- a/bsp/gd32/gd32305r-start/SConstruct +++ b/bsp/gd32/gd32305r-start/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 rtthread.map') diff --git a/bsp/gd32/gd32305r-start/board/SConscript b/bsp/gd32/gd32305r-start/board/SConscript index 73501b86f47..09ae44cf73b 100644 --- a/bsp/gd32/gd32305r-start/board/SConscript +++ b/bsp/gd32/gd32305r-start/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/GCC/startup_gd32f30x_cl.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/ARM/startup_gd32f30x_cl.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F30x_Firmware_Library/CMSIS/GD/GD32F30x/Source/IAR/startup_gd32f30x_cl.s'] CPPDEFINES = ['GD32F30X_CL'] diff --git a/bsp/gd32/gd32305r-start/rtconfig.py b/bsp/gd32/gd32305r-start/rtconfig.py index a91905a233a..2075890edf1 100644 --- a/bsp/gd32/gd32305r-start/rtconfig.py +++ b/bsp/gd32/gd32305r-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32/gd32407v-start/SConstruct b/bsp/gd32/gd32407v-start/SConstruct index 71deeebad13..2e0cd022f1f 100644 --- a/bsp/gd32/gd32407v-start/SConstruct +++ b/bsp/gd32/gd32407v-start/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 rtthread.map') diff --git a/bsp/gd32/gd32407v-start/board/SConscript b/bsp/gd32/gd32407v-start/board/SConscript index f386c039965..0d775ec7dc4 100644 --- a/bsp/gd32/gd32407v-start/board/SConscript +++ b/bsp/gd32/gd32407v-start/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/GCC/startup_gd32f4xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s'] CPPDEFINES = ['GD32F407'] diff --git a/bsp/gd32/gd32407v-start/rtconfig.py b/bsp/gd32/gd32407v-start/rtconfig.py index a91905a233a..2075890edf1 100644 --- a/bsp/gd32/gd32407v-start/rtconfig.py +++ b/bsp/gd32/gd32407v-start/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32/gd32450i-eval/SConstruct b/bsp/gd32/gd32450i-eval/SConstruct index 71deeebad13..2e0cd022f1f 100644 --- a/bsp/gd32/gd32450i-eval/SConstruct +++ b/bsp/gd32/gd32450i-eval/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 rtthread.map') diff --git a/bsp/gd32/gd32450i-eval/board/SConscript b/bsp/gd32/gd32450i-eval/board/SConscript index b1ae6aa30e7..cc9fd76fbd8 100644 --- a/bsp/gd32/gd32450i-eval/board/SConscript +++ b/bsp/gd32/gd32450i-eval/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/GCC/startup_gd32f4xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s'] CPPDEFINES = ['GD32F450'] diff --git a/bsp/gd32/gd32450i-eval/rtconfig.py b/bsp/gd32/gd32450i-eval/rtconfig.py index c0c0b203cfb..c6165614cb9 100644 --- a/bsp/gd32/gd32450i-eval/rtconfig.py +++ b/bsp/gd32/gd32450i-eval/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32/gd32450z-eval/SConstruct b/bsp/gd32/gd32450z-eval/SConstruct index 71deeebad13..2e0cd022f1f 100644 --- a/bsp/gd32/gd32450z-eval/SConstruct +++ b/bsp/gd32/gd32450z-eval/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 rtthread.map') diff --git a/bsp/gd32/gd32450z-eval/board/SConscript b/bsp/gd32/gd32450z-eval/board/SConscript index b1ae6aa30e7..cc9fd76fbd8 100644 --- a/bsp/gd32/gd32450z-eval/board/SConscript +++ b/bsp/gd32/gd32450z-eval/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/GCC/startup_gd32f4xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/GD32F4xx_Firmware_Library/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s'] CPPDEFINES = ['GD32F450'] diff --git a/bsp/gd32/gd32450z-eval/rtconfig.py b/bsp/gd32/gd32450z-eval/rtconfig.py index c0c0b203cfb..c6165614cb9 100644 --- a/bsp/gd32/gd32450z-eval/rtconfig.py +++ b/bsp/gd32/gd32450z-eval/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/gd32105c-eval/Libraries/SConscript b/bsp/gd32105c-eval/Libraries/SConscript index 2c49ad231f5..9310cdf80c3 100644 --- a/bsp/gd32105c-eval/Libraries/SConscript +++ b/bsp/gd32105c-eval/Libraries/SConscript @@ -10,11 +10,11 @@ src = Glob('GD32F10x_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F10x/Source/system_gd32f10x.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] path = [ diff --git a/bsp/gd32105c-eval/SConstruct b/bsp/gd32105c-eval/SConstruct index 1bde67c9023..6712d0169f6 100644 --- a/bsp/gd32105c-eval/SConstruct +++ b/bsp/gd32105c-eval/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/gd32105c-eval/rtconfig.py b/bsp/gd32105c-eval/rtconfig.py index 7a845afd38f..253e258b37d 100644 --- a/bsp/gd32105c-eval/rtconfig.py +++ b/bsp/gd32105c-eval/rtconfig.py @@ -17,8 +17,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/gd32107c-eval/Libraries/SConscript b/bsp/gd32107c-eval/Libraries/SConscript index 2c49ad231f5..9310cdf80c3 100644 --- a/bsp/gd32107c-eval/Libraries/SConscript +++ b/bsp/gd32107c-eval/Libraries/SConscript @@ -10,11 +10,11 @@ src = Glob('GD32F10x_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F10x/Source/system_gd32f10x.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/CMSIS/GD/GD32F10x/Source/GCC/startup_gd32f10x_cl.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F10x/Source/ARM/startup_gd32f10x_cl.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/CMSIS/GD/GD32F10x/Source/IAR/startup_gd32f10x_cl.s'] path = [ diff --git a/bsp/gd32107c-eval/SConstruct b/bsp/gd32107c-eval/SConstruct index 1bde67c9023..6712d0169f6 100644 --- a/bsp/gd32107c-eval/SConstruct +++ b/bsp/gd32107c-eval/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/gd32107c-eval/rtconfig.py b/bsp/gd32107c-eval/rtconfig.py index 7a845afd38f..253e258b37d 100644 --- a/bsp/gd32107c-eval/rtconfig.py +++ b/bsp/gd32107c-eval/rtconfig.py @@ -17,8 +17,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/gd32303e-eval/Libraries/SConscript b/bsp/gd32303e-eval/Libraries/SConscript index c1ad0562071..42bfdc9a870 100644 --- a/bsp/gd32303e-eval/Libraries/SConscript +++ b/bsp/gd32303e-eval/Libraries/SConscript @@ -10,11 +10,11 @@ src = Glob('GD32F30x_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F30x/Source/system_gd32f30x.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/CMSIS/GD/GD32F30x/Source/GCC/startup_gd32f30x_hd.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F30x/Source/ARM/startup_gd32f30x_hd.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/CMSIS/GD/GD32F30x/Source/IAR/startup_gd32f30x_hd.s'] path = [ diff --git a/bsp/gd32303e-eval/SConstruct b/bsp/gd32303e-eval/SConstruct index 1bde67c9023..6712d0169f6 100644 --- a/bsp/gd32303e-eval/SConstruct +++ b/bsp/gd32303e-eval/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/gd32303e-eval/rtconfig.py b/bsp/gd32303e-eval/rtconfig.py index c631bc3e443..691c41e9a4d 100644 --- a/bsp/gd32303e-eval/rtconfig.py +++ b/bsp/gd32303e-eval/rtconfig.py @@ -17,8 +17,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/gd32350r-eval/Libraries/SConscript b/bsp/gd32350r-eval/Libraries/SConscript index eb25cf1e7ab..a1a55b196f1 100644 --- a/bsp/gd32350r-eval/Libraries/SConscript +++ b/bsp/gd32350r-eval/Libraries/SConscript @@ -10,11 +10,11 @@ src = Glob('GD32F3x0_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F3x0/Source/system_gd32f3x0.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/CMSIS/GD/GD32F3x0/Source/GCC/startup_gd32f3x0.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F3x0/Source/ARM/startup_gd32f3x0.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/CMSIS/GD/GD32F3x0/Source/IAR/startup_gd32f3x0.s'] path = [ diff --git a/bsp/gd32350r-eval/SConstruct b/bsp/gd32350r-eval/SConstruct index 208ab935b98..644ffee2aef 100644 --- a/bsp/gd32350r-eval/SConstruct +++ b/bsp/gd32350r-eval/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/gd32350r-eval/rtconfig.py b/bsp/gd32350r-eval/rtconfig.py index 1db5d5c2ba4..62a01d81868 100644 --- a/bsp/gd32350r-eval/rtconfig.py +++ b/bsp/gd32350r-eval/rtconfig.py @@ -18,8 +18,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -82,7 +82,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/gd32450z-eval/Libraries/SConscript b/bsp/gd32450z-eval/Libraries/SConscript index 42e112815a8..1ee18f08c01 100644 --- a/bsp/gd32450z-eval/Libraries/SConscript +++ b/bsp/gd32450z-eval/Libraries/SConscript @@ -10,11 +10,11 @@ src = Glob('GD32F4xx_standard_peripheral/Source/*.c') src += [cwd + '/CMSIS/GD/GD32F4xx/Source/system_gd32f4xx.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/CMSIS/GD/GD32F4xx/Source/GCC/startup_gd32f4xx.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32F4xx/Source/ARM/startup_gd32f4xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/CMSIS/GD/GD32F4xx/Source/IAR/startup_gd32f4xx.s'] path = [ diff --git a/bsp/gd32450z-eval/SConstruct b/bsp/gd32450z-eval/SConstruct index 6b5d5618480..8190948a33d 100644 --- a/bsp/gd32450z-eval/SConstruct +++ b/bsp/gd32450z-eval/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/gd32450z-eval/rtconfig.py b/bsp/gd32450z-eval/rtconfig.py index 1f01ffe88b7..56fce9b8c05 100644 --- a/bsp/gd32450z-eval/rtconfig.py +++ b/bsp/gd32450z-eval/rtconfig.py @@ -18,8 +18,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -82,7 +82,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/gd32e230k-start/Libraries/SConscript b/bsp/gd32e230k-start/Libraries/SConscript index 7d8683a664a..c531f34b319 100644 --- a/bsp/gd32e230k-start/Libraries/SConscript +++ b/bsp/gd32e230k-start/Libraries/SConscript @@ -12,7 +12,7 @@ src += [cwd + '/CMSIS/GD/GD32E230/Source/system_gd32e230.c'] #add for startup script if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/CMSIS/GD/GD32E230/Source/ARM/startup_gd32e230.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/CMSIS/GD/GD32E230/Source/IAR/startup_gd32e230.s'] path = [ diff --git a/bsp/gd32e230k-start/SConstruct b/bsp/gd32e230k-start/SConstruct index 13bbaca0b00..7b40e974025 100644 --- a/bsp/gd32e230k-start/SConstruct +++ b/bsp/gd32e230k-start/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/gd32e230k-start/rtconfig.py b/bsp/gd32e230k-start/rtconfig.py index 7f466916bba..9aad0f59ae5 100644 --- a/bsp/gd32e230k-start/rtconfig.py +++ b/bsp/gd32e230k-start/rtconfig.py @@ -17,8 +17,8 @@ PLATFORM = 'armclang' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -87,7 +87,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/hc32/ev_hc32f4a0_lqfp176/SConstruct b/bsp/hc32/ev_hc32f4a0_lqfp176/SConstruct index b255bbb97a1..e316b76d4d4 100644 --- a/bsp/hc32/ev_hc32f4a0_lqfp176/SConstruct +++ b/bsp/hc32/ev_hc32f4a0_lqfp176/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 rtthread.map') diff --git a/bsp/hc32/ev_hc32f4a0_lqfp176/board/SConscript b/bsp/hc32/ev_hc32f4a0_lqfp176/board/SConscript index 03d0c9f8758..2bb1cdd809f 100644 --- a/bsp/hc32/ev_hc32f4a0_lqfp176/board/SConscript +++ b/bsp/hc32/ev_hc32f4a0_lqfp176/board/SConscript @@ -28,7 +28,7 @@ if rtconfig.CROSS_TOOL == 'gcc': src += [startup_path_prefix + '/hc32f4a0_ddl/drivers/cmsis/Device/HDSC/hc32f4xx/Source/GCC/startup_hc32f4a0.S'] elif rtconfig.CROSS_TOOL == 'keil': src += [startup_path_prefix + '/hc32f4a0_ddl/drivers/cmsis/Device/HDSC/hc32f4xx/Source/ARM/startup_hc32f4a0.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/hc32f4a0_ddl/drivers/cmsis/Device/HDSC/hc32f4xx/Source/IAR/startup_hc32f4a0.s'] CPPDEFINES = ['HC32F4A0'] diff --git a/bsp/hc32/ev_hc32f4a0_lqfp176/rtconfig.py b/bsp/hc32/ev_hc32f4a0_lqfp176/rtconfig.py index b0b7b6a25e0..734f7beca4b 100644 --- a/bsp/hc32/ev_hc32f4a0_lqfp176/rtconfig.py +++ b/bsp/hc32/ev_hc32f4a0_lqfp176/rtconfig.py @@ -22,7 +22,7 @@ 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.4' if os.getenv('RTT_EXEC_PATH'): @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/hc32f460/Libraries/SConscript b/bsp/hc32f460/Libraries/SConscript index 2172212e3e6..987b437a02c 100644 --- a/bsp/hc32f460/Libraries/SConscript +++ b/bsp/hc32f460/Libraries/SConscript @@ -28,11 +28,11 @@ if GetDepend(['RT_USING_SERIAL']): src += ['HC32F460_StdPeriph_Driver/src/hc32f460_usart.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['CMSIS/Device/HDSC/HC32F460/Source/GCC/startup_hc32f460.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/HDSC/HC32F460/Source/ARM/startup_hc32f460.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['CMSIS/Device/HDSC/HC32F460/Source/IAR/startup_hc32f460.s'] #add headfile script diff --git a/bsp/hc32f460/SConstruct b/bsp/hc32f460/SConstruct index 3ab72864243..d1ac0fc2aaa 100644 --- a/bsp/hc32f460/SConstruct +++ b/bsp/hc32f460/SConstruct @@ -28,7 +28,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 project.map') diff --git a/bsp/hc32f460/rtconfig.py b/bsp/hc32f460/rtconfig.py index 462c2009f63..d0d81cd0c0f 100644 --- a/bsp/hc32f460/rtconfig.py +++ b/bsp/hc32f460/rtconfig.py @@ -21,7 +21,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'D:\03_software\Program Files\Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'D:\03_software\Program Files\IAR Systems\Embedded Workbench 8.0' if os.getenv('RTT_EXEC_PATH'): @@ -84,7 +84,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/hc32l136/Libraries/SConscript b/bsp/hc32l136/Libraries/SConscript index d5a8e25e97d..9877efe6da9 100644 --- a/bsp/hc32l136/Libraries/SConscript +++ b/bsp/hc32l136/Libraries/SConscript @@ -29,11 +29,11 @@ if GetDepend(['RT_USING_WDT']): src += ['HC32L136_StdPeriph_Driver/src/wdt.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['CMSIS/Device/HDSC/HC32L136/Source/GCC/startup_hc32l136.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/HDSC/HC32L136/Source/ARM/startup_hc32l136.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['CMSIS/Device/HDSC/HC32L136/Source/IAR/startup_hc32l136.s'] #add headfile script diff --git a/bsp/hc32l136/SConstruct b/bsp/hc32l136/SConstruct index 7299f4d4b43..68378bc0fba 100644 --- a/bsp/hc32l136/SConstruct +++ b/bsp/hc32l136/SConstruct @@ -28,7 +28,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 project.map') diff --git a/bsp/hc32l136/rtconfig.py b/bsp/hc32l136/rtconfig.py index 4556c8a87e5..e55becc53c1 100644 --- a/bsp/hc32l136/rtconfig.py +++ b/bsp/hc32l136/rtconfig.py @@ -21,7 +21,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'D:\03_software\Program Files\Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'D:\03_software\Program Files\IAR Systems\Embedded Workbench 7.5' if os.getenv('RTT_EXEC_PATH'): @@ -84,7 +84,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/hc32l196/Libraries/SConscript b/bsp/hc32l196/Libraries/SConscript index e89dc609be7..d4a66b0794d 100644 --- a/bsp/hc32l196/Libraries/SConscript +++ b/bsp/hc32l196/Libraries/SConscript @@ -21,11 +21,11 @@ if GetDepend(['RT_USING_SERIAL']): src += ['HC32L196_StdPeriph_Driver/src/hc32l196_uart.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['CMSIS/Device/HDSC/HC32L196/Source/GCC/startup_hc32l19x.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/HDSC/HC32L196/Source/ARM/startup_hc32l19x.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['CMSIS/Device/HDSC/HC32L196/Source/IAR/startup_hc32l19x.s'] #add headfile script diff --git a/bsp/hc32l196/SConstruct b/bsp/hc32l196/SConstruct index 036c84e1d52..61f0758becf 100644 --- a/bsp/hc32l196/SConstruct +++ b/bsp/hc32l196/SConstruct @@ -28,7 +28,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/hc32l196/rtconfig.py b/bsp/hc32l196/rtconfig.py index cd1789c8466..a63cea240e5 100644 --- a/bsp/hc32l196/rtconfig.py +++ b/bsp/hc32l196/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -92,7 +92,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/hk32/hk32f030c8-mini/SConstruct b/bsp/hk32/hk32f030c8-mini/SConstruct index 38402903111..6ec5f496a9e 100644 --- a/bsp/hk32/hk32f030c8-mini/SConstruct +++ b/bsp/hk32/hk32f030c8-mini/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/hk32/hk32f030c8-mini/board/SConscript b/bsp/hk32/hk32f030c8-mini/board/SConscript index 62c5d1532d4..896a036b4c1 100644 --- a/bsp/hk32/hk32f030c8-mini/board/SConscript +++ b/bsp/hk32/hk32f030c8-mini/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/msp'] startup_path_prefix = SDK_LIB src += [startup_path_prefix + '/HK32F0xx_StdPeriph_Driver/CMSIS/HK32F0xx/Source/system_hk32f0xx.c'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/HK32F0xx_StdPeriph_Driver/CMSIS/HK32F0xx/Source/gcc/startup_hk32f030x4x6x8.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/HK32F0xx_StdPeriph_Driver/CMSIS/HK32F0xx/Source/ARM/startup_hk32f030x4x6x8.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/HK32F0xx_StdPeriph_Driver/CMSIS/HK32F0xx/Source/iar/startup_hk32f030x4x6x8.s'] CPPDEFINES = ['HK32F030x8'] diff --git a/bsp/hk32/hk32f030c8-mini/rtconfig.py b/bsp/hk32/hk32f030c8-mini/rtconfig.py index 8e4b701f1ce..97aa33f0c57 100644 --- a/bsp/hk32/hk32f030c8-mini/rtconfig.py +++ b/bsp/hk32/hk32f030c8-mini/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/imx6sx/cortex-a9/cpu/SConscript b/bsp/imx6sx/cortex-a9/cpu/SConscript index d845dc486a8..9c276325037 100644 --- a/bsp/imx6sx/cortex-a9/cpu/SConscript +++ b/bsp/imx6sx/cortex-a9/cpu/SConscript @@ -5,9 +5,9 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -elif rtconfig.PLATFORM == 'gcc': +elif rtconfig.PLATFORM in ['gcc']: src += Glob('*_gcc.S') elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') diff --git a/bsp/imx6sx/cortex-a9/rtconfig.py b/bsp/imx6sx/cortex-a9/rtconfig.py index 3832ca675b0..349852950f2 100644 --- a/bsp/imx6sx/cortex-a9/rtconfig.py +++ b/bsp/imx6sx/cortex-a9/rtconfig.py @@ -83,7 +83,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/imxrt1021-nxp-evk/SConstruct b/bsp/imxrt/imxrt1021-nxp-evk/SConstruct index 5979f0a945b..8c8f7501594 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/imxrt1021-nxp-evk/rtconfig.py b/bsp/imxrt/imxrt1021-nxp-evk/rtconfig.py index f05d337efee..70a8122496b 100644 --- a/bsp/imxrt/imxrt1021-nxp-evk/rtconfig.py +++ b/bsp/imxrt/imxrt1021-nxp-evk/rtconfig.py @@ -23,7 +23,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:\Program Files\IAR Systems\Embedded Workbench 9.0' if os.getenv('RTT_EXEC_PATH'): @@ -101,7 +101,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/imxrt1052-atk-commander/SConstruct b/bsp/imxrt/imxrt1052-atk-commander/SConstruct index 55ebf9d3919..f7eb3c0c5e9 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-atk-commander/applications/SConscript b/bsp/imxrt/imxrt1052-atk-commander/applications/SConscript index 256e8a5a0c3..26c10c855ff 100644 --- a/bsp/imxrt/imxrt1052-atk-commander/applications/SConscript +++ b/bsp/imxrt/imxrt1052-atk-commander/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py b/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py index cf79de685ad..fe922082169 100644 --- a/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py +++ b/bsp/imxrt/imxrt1052-atk-commander/rtconfig.py @@ -23,8 +23,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -101,7 +101,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/imxrt1052-fire-pro/SConstruct b/bsp/imxrt/imxrt1052-fire-pro/SConstruct index 55ebf9d3919..f7eb3c0c5e9 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-fire-pro/applications/SConscript b/bsp/imxrt/imxrt1052-fire-pro/applications/SConscript index 256e8a5a0c3..26c10c855ff 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/applications/SConscript +++ b/bsp/imxrt/imxrt1052-fire-pro/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py b/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py index 552cefe8356..60d2a9fc13b 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py +++ b/bsp/imxrt/imxrt1052-fire-pro/rtconfig.py @@ -23,8 +23,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -101,7 +101,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/imxrt1052-nxp-evk/SConstruct b/bsp/imxrt/imxrt1052-nxp-evk/SConstruct index 42b12299a39..b2f0587d56b 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-nxp-evk/applications/SConscript b/bsp/imxrt/imxrt1052-nxp-evk/applications/SConscript index 256e8a5a0c3..26c10c855ff 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/applications/SConscript +++ b/bsp/imxrt/imxrt1052-nxp-evk/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py b/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py index 1c90a8bdaae..456c1f9267f 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py +++ b/bsp/imxrt/imxrt1052-nxp-evk/rtconfig.py @@ -23,8 +23,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -104,7 +104,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct b/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct index 55ebf9d3919..f7eb3c0c5e9 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/imxrt1052-seeed-ArchMix/applications/SConscript b/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript index 256e8a5a0c3..26c10c855ff 100644 --- a/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript +++ b/bsp/imxrt/imxrt1052-seeed-ArchMix/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.py b/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.py index cf79de685ad..fe922082169 100644 --- a/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.py +++ b/bsp/imxrt/imxrt1052-seeed-ArchMix/rtconfig.py @@ -23,8 +23,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -101,7 +101,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/imxrt1060-nxp-evk/SConstruct b/bsp/imxrt/imxrt1060-nxp-evk/SConstruct index b9be046c728..a45850ddd79 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/imxrt1060-nxp-evk/applications/SConscript b/bsp/imxrt/imxrt1060-nxp-evk/applications/SConscript index 69e3f9b88e0..ee6c5b72300 100644 --- a/bsp/imxrt/imxrt1060-nxp-evk/applications/SConscript +++ b/bsp/imxrt/imxrt1060-nxp-evk/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py b/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py index 71d719d5ebe..57e61851aaa 100644 --- a/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py +++ b/bsp/imxrt/imxrt1060-nxp-evk/rtconfig.py @@ -23,8 +23,8 @@ # EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'D:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -141,7 +141,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct b/bsp/imxrt/imxrt1064-nxp-evk/SConstruct index 96668a9c4c1..30ea7676b8f 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/imxrt1064-nxp-evk/applications/SConscript b/bsp/imxrt/imxrt1064-nxp-evk/applications/SConscript index 256e8a5a0c3..26c10c855ff 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/applications/SConscript +++ b/bsp/imxrt/imxrt1064-nxp-evk/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py b/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py index 9689ac0bcb1..b2256edd04c 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py +++ b/bsp/imxrt/imxrt1064-nxp-evk/rtconfig.py @@ -23,8 +23,8 @@ # EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'D:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -106,7 +106,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --i32combined $TARGET --output="rtthread-mdk.hex" \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/imxrt1170-nxp-evk/SConstruct b/bsp/imxrt/imxrt1170-nxp-evk/SConstruct index 32310b0942b..622d3d16f02 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/imxrt1170-nxp-evk/rtconfig.py b/bsp/imxrt/imxrt1170-nxp-evk/rtconfig.py index 1c90a8bdaae..456c1f9267f 100644 --- a/bsp/imxrt/imxrt1170-nxp-evk/rtconfig.py +++ b/bsp/imxrt/imxrt1170-nxp-evk/rtconfig.py @@ -23,8 +23,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -104,7 +104,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/libraries/MIMXRT1020/SConscript b/bsp/imxrt/libraries/MIMXRT1020/SConscript index 812147e1380..4a1a35c28ba 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 e28febe813a..cd7e6829471 100644 --- a/bsp/imxrt/libraries/MIMXRT1050/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1050/SConscript @@ -10,11 +10,11 @@ src = Split(''' MIMXRT1052/drivers/fsl_cache.c ''') -if rtconfig.PLATFORM == 'gcc': +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']): @@ -87,7 +87,7 @@ src += ['MIMXRT1052/drivers/fsl_xbarb.c'] src += ['MIMXRT1052/drivers/fsl_os_abstraction_rtthread.c'] src += ['MIMXRT1052/drivers/generic_list.c'] -if rtconfig.PLATFORM == '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) diff --git a/bsp/imxrt/libraries/MIMXRT1060/SConscript b/bsp/imxrt/libraries/MIMXRT1060/SConscript index b7f79e1fc9b..84568cbb656 100644 --- a/bsp/imxrt/libraries/MIMXRT1060/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1060/SConscript @@ -11,11 +11,11 @@ src = Split(''' MIMXRT1060/drivers/fsl_cache.c ''') -if rtconfig.PLATFORM == 'gcc': +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']): @@ -106,7 +106,7 @@ src += ['MIMXRT1060/drivers/fsl_xbarb.c'] # src += ['MIMXRT1060/drivers/fsl_os_abstraction_rtthread.c'] # src += ['MIMXRT1060/drivers/generic_list.c'] -if rtconfig.PLATFORM == '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) diff --git a/bsp/imxrt/libraries/MIMXRT1064/SConscript b/bsp/imxrt/libraries/MIMXRT1064/SConscript index 38124f8f7e4..be1b31eb085 100644 --- a/bsp/imxrt/libraries/MIMXRT1064/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1064/SConscript @@ -10,11 +10,11 @@ MIMXRT1064/drivers/fsl_clock.c MIMXRT1064/drivers/fsl_cache.c ''') -if rtconfig.PLATFORM == 'gcc': +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']): @@ -77,7 +77,7 @@ if GetDepend(['RT_SERIAL_USING_DMA']): src += ['MIMXRT1064/drivers/fsl_lpuart_edma.c'] src += ['MIMXRT1064/drivers/fsl_lpspi_edma.c'] -if rtconfig.PLATFORM == '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) diff --git a/bsp/imxrt/libraries/MIMXRT1170/SConscript b/bsp/imxrt/libraries/MIMXRT1170/SConscript index c0d93ab72b2..60e27099ef3 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 923c623f176..e4b3f6c66ac 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/imxrt1050xxx/applications/SConscript b/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript index 256e8a5a0c3..26c10c855ff 100644 --- a/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript +++ b/bsp/imxrt/libraries/templates/imxrt1050xxx/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/rtconfig.py b/bsp/imxrt/libraries/templates/imxrt1050xxx/rtconfig.py index 6944bf739bd..517946d2d58 100644 --- a/bsp/imxrt/libraries/templates/imxrt1050xxx/rtconfig.py +++ b/bsp/imxrt/libraries/templates/imxrt1050xxx/rtconfig.py @@ -19,8 +19,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -97,7 +97,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct b/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct index a3f416164f7..e5611ff1e68 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') diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript b/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript index 256e8a5a0c3..26c10c855ff 100644 --- a/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript +++ b/bsp/imxrt/libraries/templates/imxrt1064xxx/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/rtconfig.py b/bsp/imxrt/libraries/templates/imxrt1064xxx/rtconfig.py index bd8fbea1bac..331106dac0d 100644 --- a/bsp/imxrt/libraries/templates/imxrt1064xxx/rtconfig.py +++ b/bsp/imxrt/libraries/templates/imxrt1064xxx/rtconfig.py @@ -19,8 +19,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -99,7 +99,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --i32combined $TARGET --output="rtthread-mdk.hex" \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lm3s8962/Libraries/SConscript b/bsp/lm3s8962/Libraries/SConscript index 100cf72b4a0..b87d7d3c6ec 100644 --- a/bsp/lm3s8962/Libraries/SConscript +++ b/bsp/lm3s8962/Libraries/SConscript @@ -11,11 +11,11 @@ if rtconfig.PART_TYPE.startswith('PART_LM4F') != True: SrcRemove(src, 'fpu.c') # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['startup/gcc/start_gcc.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/arm/start_rvds.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['startup/iar/start_iar.S'] CPPPATH = [cwd] diff --git a/bsp/lm3s9b9x/Libraries/SConscript b/bsp/lm3s9b9x/Libraries/SConscript index f55bd84efb6..ea4b469c858 100644 --- a/bsp/lm3s9b9x/Libraries/SConscript +++ b/bsp/lm3s9b9x/Libraries/SConscript @@ -11,11 +11,11 @@ if rtconfig.PART_TYPE.startswith('PART_LM4F') != True: SrcRemove(src, 'fpu.c') # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['startup/gcc/start_gcc.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/arm/start_rvds.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['startup/iar/start_iar.S'] CPPPATH = [cwd] diff --git a/bsp/lm4f232/Libraries/SConscript b/bsp/lm4f232/Libraries/SConscript index ea5d8102a7e..c6809cafc44 100644 --- a/bsp/lm4f232/Libraries/SConscript +++ b/bsp/lm4f232/Libraries/SConscript @@ -11,17 +11,17 @@ if rtconfig.PART_TYPE.startswith('PART_LM4F') != True: SrcRemove(src, 'fpu.c') # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['startup/gcc/start_gcc.c'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/arm/start_rvds.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['startup/iar/start_iar.S'] CPPPATH = [cwd] CPPDEFINES = [rtconfig.PART_TYPE] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES += ['gcc']; group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/lpc176x/CMSIS/SConscript b/bsp/lpc176x/CMSIS/SConscript index 2908e197a3c..d6650de4cce 100644 --- a/bsp/lpc176x/CMSIS/SConscript +++ b/bsp/lpc176x/CMSIS/SConscript @@ -7,11 +7,11 @@ cwd = GetCurrentDir() src = ['CM3/DeviceSupport/NXP/LPC17xx/system_LPC17xx.c'] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['CM3/DeviceSupport/NXP/LPC17xx/startup/gcc/startup_LPC17xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CM3/DeviceSupport/NXP/LPC17xx/startup/arm/startup_LPC17xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['CM3/DeviceSupport/NXP/LPC17xx/startup/iar/startup_LPC17xx.s'] CPPPATH = [cwd + '/CM3/DeviceSupport/NXP/LPC17xx/', diff --git a/bsp/lpc176x/SConstruct b/bsp/lpc176x/SConstruct index d99a3c0d920..07d225b1e4c 100644 --- a/bsp/lpc176x/SConstruct +++ b/bsp/lpc176x/SConstruct @@ -18,7 +18,7 @@ env = Environment(tools = ['mingw'], AR = rtconfig.AR, ARFLAGS = '-rc', LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) -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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) diff --git a/bsp/lpc176x/rtconfig.py b/bsp/lpc176x/rtconfig.py index 6ea5b5c8a45..01845cfcfbe 100644 --- a/bsp/lpc176x/rtconfig.py +++ b/bsp/lpc176x/rtconfig.py @@ -15,7 +15,7 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation' if os.getenv('RTT_EXEC_PATH'): @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lpc178x/CMSIS/SConscript b/bsp/lpc178x/CMSIS/SConscript index 9d12b5ade81..95020fc5173 100644 --- a/bsp/lpc178x/CMSIS/SConscript +++ b/bsp/lpc178x/CMSIS/SConscript @@ -8,11 +8,11 @@ src = ['CM3/CoreSupport/core_cm3.c', 'CM3/DeviceSupport/NXP/LPC177x_8x/system_LP CPPPATH = [cwd + '/CM3/CoreSupport', cwd + '/CM3/DeviceSupport/NXP/LPC177x_8x/'] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['CM3/DeviceSupport/NXP/LPC177x_8x/startup/gcc/startup_LPC177x_8x.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CM3/DeviceSupport/NXP/LPC177x_8x/startup/arm/startup_LPC177x_8x.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['CM3/DeviceSupport/NXP/LPC177x_8x/startup/iar/startup_LPC177x_8x.s'] group = DefineGroup('CMSIS', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/lpc2148/rtconfig.py b/bsp/lpc2148/rtconfig.py index 95e0c18e459..c2b1678fda1 100644 --- a/bsp/lpc2148/rtconfig.py +++ b/bsp/lpc2148/rtconfig.py @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lpc2478/rtconfig.py b/bsp/lpc2478/rtconfig.py index 1622ed54cc3..81b28c40641 100644 --- a/bsp/lpc2478/rtconfig.py +++ b/bsp/lpc2478/rtconfig.py @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lpc408x/Libraries/Device/SConscript b/bsp/lpc408x/Libraries/Device/SConscript index f2e567cce71..53360e18615 100644 --- a/bsp/lpc408x/Libraries/Device/SConscript +++ b/bsp/lpc408x/Libraries/Device/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd + '/NXP/LPC407x_8x_177x_8x/Include', cwd + '/../CMSIS/Include'] CPPDEFINES = ['CORE_M4'] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['NXP/LPC407x_8x_177x_8x/Source/Templates/GCC/startup_LPC407x_8x_177x_8x.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC407x_8x_177x_8x/Source/Templates/ARM/startup_LPC407x_8x_177x_8x.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['NXP/LPC407x_8x_177x_8x/Source/Templates/IAR/startup_LPC407x_8x_177x_8x.s'] group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/lpc408x/SConstruct b/bsp/lpc408x/SConstruct index 4c7358b15f4..dc6db0a31cb 100644 --- a/bsp/lpc408x/SConstruct +++ b/bsp/lpc408x/SConstruct @@ -21,7 +21,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 project.map') diff --git a/bsp/lpc43xx/Libraries/Device/SConscript b/bsp/lpc43xx/Libraries/Device/SConscript index fed180fd71f..8084ff93ff6 100644 --- a/bsp/lpc43xx/Libraries/Device/SConscript +++ b/bsp/lpc43xx/Libraries/Device/SConscript @@ -12,18 +12,18 @@ CPPDEFINES = [rtconfig.USE_CORE] CPPDEFINES += ['USE_SPIFI'] # add for startup script if rtconfig.USE_CORE =='CORE_M4': - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx.s'] - elif rtconfig.CROSS_TOOL == 'iar': + elif rtconfig.PLATFORM in ['iccarm']: src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx.s'] else: - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx_M0.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx_M0.s'] - elif rtconfig.CROSS_TOOL == 'iar': + elif rtconfig.PLATFORM in ['iccarm']: src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx_M0.s'] group = DefineGroup('CMSIS', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/lpc43xx/M0/SConstruct b/bsp/lpc43xx/M0/SConstruct index 25291318ddf..7e7f77dd88c 100644 --- a/bsp/lpc43xx/M0/SConstruct +++ b/bsp/lpc43xx/M0/SConstruct @@ -26,7 +26,7 @@ Export('rtconfig') # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: import glob # Remove the .o for M0 left on the drivers dir. for i in glob.glob(GetCurrentDir() + '/../drivers/*.o'): diff --git a/bsp/lpc43xx/M0/rtconfig.py b/bsp/lpc43xx/M0/rtconfig.py index e577355e838..3aa2326c4a0 100644 --- a/bsp/lpc43xx/M0/rtconfig.py +++ b/bsp/lpc43xx/M0/rtconfig.py @@ -24,7 +24,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'D:/Keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 6.0' if os.getenv('RTT_EXEC_PATH'): @@ -89,7 +89,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lpc43xx/M4/SConstruct b/bsp/lpc43xx/M4/SConstruct index b83f0114f10..4365cff7846 100644 --- a/bsp/lpc43xx/M4/SConstruct +++ b/bsp/lpc43xx/M4/SConstruct @@ -26,7 +26,7 @@ Export('rtconfig') # prepare building environment objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: print('build M0 code first') if sys.platform.startswith('linux'): import glob diff --git a/bsp/lpc43xx/M4/rtconfig.py b/bsp/lpc43xx/M4/rtconfig.py index 226c6e2cc54..7bca80f91b0 100644 --- a/bsp/lpc43xx/M4/rtconfig.py +++ b/bsp/lpc43xx/M4/rtconfig.py @@ -28,7 +28,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'D:/Keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 6.0' if os.getenv('RTT_EXEC_PATH'): @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lpc5410x/Libraries/Device/SConscript b/bsp/lpc5410x/Libraries/Device/SConscript index 56fd0751780..ae9805c9077 100644 --- a/bsp/lpc5410x/Libraries/Device/SConscript +++ b/bsp/lpc5410x/Libraries/Device/SConscript @@ -12,7 +12,7 @@ CPPDEFINES = ['CORE_M4'] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['startup/gcc_startup_lpc5410x.c'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/keil_startup_lpc5410x.s'] diff --git a/bsp/lpc5410x/Libraries/lpc_chip/SConscript b/bsp/lpc5410x/Libraries/lpc_chip/SConscript index 6b9cd35fd52..a86b71b6c78 100644 --- a/bsp/lpc5410x/Libraries/lpc_chip/SConscript +++ b/bsp/lpc5410x/Libraries/lpc_chip/SConscript @@ -61,7 +61,7 @@ chip_5410x/wwdt_5410x.c #lpc_chip\chip_5410x\power_lib\lpcxpresso # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: LIBPATH = [cwd + '/chip_5410x/power_lib/lpcxpresso'] LIBS = ['libpower'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: diff --git a/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript b/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript index c12c5623205..b9e88373613 100644 --- a/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript +++ b/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript @@ -13,12 +13,12 @@ CPPDEFINES = [] objs = objs + SConscript(os.path.join('drivers', 'SConscript')) objs = objs + SConscript(os.path.join('utilities', 'SConscript')) -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: objs = objs + SConscript(os.path.join('gcc', 'SConscript')) CPPDEFINES += ['__USE_CMSIS'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: objs = objs + SConscript(os.path.join('arm', 'SConscript')) -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: objs = objs + SConscript(os.path.join('iar', 'SConscript')) src = Split(""" diff --git a/bsp/lpc54114-lite/SConstruct b/bsp/lpc54114-lite/SConstruct index 5a25d0f3022..4f41969faa6 100644 --- a/bsp/lpc54114-lite/SConstruct +++ b/bsp/lpc54114-lite/SConstruct @@ -26,7 +26,7 @@ if rtconfig.PLATFORM == 'armcc': 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 project.map') diff --git a/bsp/lpc54114-lite/rtconfig.py b/bsp/lpc54114-lite/rtconfig.py index dca2f52e79d..1199adf6f1d 100644 --- a/bsp/lpc54114-lite/rtconfig.py +++ b/bsp/lpc54114-lite/rtconfig.py @@ -16,7 +16,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'D:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' if os.getenv('RTT_EXEC_PATH'): @@ -86,7 +86,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript b/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript index 3b59a9726c4..a825e384326 100644 --- a/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript +++ b/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript @@ -13,12 +13,12 @@ CPPDEFINES = [] objs = objs + SConscript(os.path.join('drivers', 'SConscript')) objs = objs + SConscript(os.path.join('utilities', 'SConscript')) -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: objs = objs + SConscript(os.path.join('mcuxpresso', 'SConscript')) CPPDEFINES += ['__USE_CMSIS'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: objs = objs + SConscript(os.path.join('arm', 'SConscript')) -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: objs = objs + SConscript(os.path.join('iar', 'SConscript')) src = Glob('*.c') diff --git a/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript b/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript index 140e3af64f9..4555af0682e 100644 --- a/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript +++ b/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript @@ -7,11 +7,11 @@ src = Split(''' LPC55S6X/system_LPC55S69_cm33_core0.c ''') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['LPC55S6X/gcc/startup_LPC55S69_cm33_core0.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['LPC55S6X/arm/startup_LPC55S69_cm33_core0.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['LPC55S6X/iar/startup_LPC55S69_cm33_core0.s'] src += ['LPC55S6X/drivers/fsl_anactrl.c'] @@ -58,11 +58,11 @@ src += ['middleware/sdmmc/src/fsl_sdmmc_common.c'] src += ['middleware/sdmmc/port/sdif/rt_thread/fsl_sdmmc_event.c'] src += ['middleware/sdmmc/port/sdif/rt_thread/fsl_sdmmc_host.c'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['LPC55S6X/gcc/libpower_hardabi.a'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['LPC55S6X/arm/keil_lib_power_cm33_core0.lib'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['LPC55S6X/iar/iar_lib_power_cm33_core0.a'] group = DefineGroup('Libraries', src, depend = [''], CPPPATH = path) diff --git a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/SConstruct b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/SConstruct index 105aaa78abb..679bd64947e 100644 --- a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/SConstruct +++ b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/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/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/SConscript b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/SConscript index 256e8a5a0c3..26c10c855ff 100644 --- a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/SConscript +++ b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('*.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/rtconfig.py b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/rtconfig.py index 25d2373c384..15fcb3f0ce6 100644 --- a/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/rtconfig.py +++ b/bsp/lpc55sxx/Libraries/template/lpc55s6xxxx/rtconfig.py @@ -21,7 +21,7 @@ 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.3' if os.getenv('RTT_EXEC_PATH'): @@ -102,7 +102,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct b/bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct index 4ad8f1ca869..91e65db7a67 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct +++ b/bsp/lpc55sxx/lpc55s69_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/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript index 41ccd00018a..2588714bbe1 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/applications/SConscript @@ -6,7 +6,7 @@ src = Glob('main.c') CPPPATH = [cwd] # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: CPPDEFINES = ['__START=entry'] else: CPPDEFINES = [] diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py index 1f394bbceae..98b2a68e362 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk/rtconfig.py @@ -22,7 +22,7 @@ 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.3' if os.getenv('RTT_EXEC_PATH'): @@ -103,7 +103,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/SConstruct b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/SConstruct index 105aaa78abb..679bd64947e 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/SConstruct +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/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/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.py b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.py index cfed933ffa9..a789fbda1f4 100644 --- a/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.py +++ b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/rtconfig.py @@ -21,7 +21,7 @@ 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.3' if os.getenv('RTT_EXEC_PATH'): @@ -102,7 +102,7 @@ POST_ACTION = 'fromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/lpc824/Libraries/SConscript b/bsp/lpc824/Libraries/SConscript index 31c3ce5a01d..2c998eee64c 100644 --- a/bsp/lpc824/Libraries/SConscript +++ b/bsp/lpc824/Libraries/SConscript @@ -11,12 +11,12 @@ src += Glob('common/board/*.c') src += Glob('common/chip/*.c') # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: print("not gcc startup file") exit(0) elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/common/startup/keil_startup_lpc82x.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/common/startup/iar_startup_lpc82x.s'] CPPPATH = [ cwd + '/peri_driver', cwd + '/common/board', diff --git a/bsp/lpc824/SConstruct b/bsp/lpc824/SConstruct index bd588f5ae07..f0545203dbb 100644 --- a/bsp/lpc824/SConstruct +++ b/bsp/lpc824/SConstruct @@ -22,7 +22,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 project.map') diff --git a/bsp/lpc824/rtconfig.py b/bsp/lpc824/rtconfig.py index 1d130785ce1..851296762de 100644 --- a/bsp/lpc824/rtconfig.py +++ b/bsp/lpc824/rtconfig.py @@ -18,8 +18,8 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/m16c62p/SConstruct b/bsp/m16c62p/SConstruct index 5ce63cff7be..9f58a229778 100644 --- a/bsp/m16c62p/SConstruct +++ b/bsp/m16c62p/SConstruct @@ -20,7 +20,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(LINKCOM = ['$LINK $SOURCES $LINKFLAGS -f lnkm30627fhp.xcl -l rtt2m16c.map -o rtt2m16c.d34 -Omotorola-s28=$TARGET']) env.Replace(ARFLAGS = '') diff --git a/bsp/m16c62p/drivers/SConscript b/bsp/m16c62p/drivers/SConscript index 65e7884cbd7..e16c1a16ddd 100644 --- a/bsp/m16c62p/drivers/SConscript +++ b/bsp/m16c62p/drivers/SConscript @@ -5,9 +5,9 @@ cwd = GetCurrentDir() src_c = Glob('*.c') # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src_asm = ['start_gcc.S', 'vectors_gcc.S', 'interrupts_gcc.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src_asm = ['start_iar.asm', 'vectors_iar.asm', 'interrupts_iar.asm'] src = File(src_c + src_asm) diff --git a/bsp/m16c62p/rtconfig.py b/bsp/m16c62p/rtconfig.py index 0e800d3532f..5443ee57b8e 100644 --- a/bsp/m16c62p/rtconfig.py +++ b/bsp/m16c62p/rtconfig.py @@ -13,7 +13,7 @@ PLATFORM = 'gcc' EXEC_PATH = 'C:/Program Files/Renesas/Hew/Tools/KPIT Cummins/GNUM16CM32C-ELF/v11.01/m32c-elf/bin' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench Evaluation 6.0' # EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench Evaluation 6.0' elif CROSS_TOOL == 'keil': @@ -55,7 +55,7 @@ POST_ACTION = OBJCPY + ' -O srec $TARGET rtthread.mot\n' + SIZE + ' $TARGET \n' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccm16c' AS = 'am16c' diff --git a/bsp/maxim/MAX32660_EVSYS/SConstruct b/bsp/maxim/MAX32660_EVSYS/SConstruct index 4e6effe7462..76cd7bd3db5 100644 --- a/bsp/maxim/MAX32660_EVSYS/SConstruct +++ b/bsp/maxim/MAX32660_EVSYS/SConstruct @@ -25,7 +25,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/maxim/MAX32660_EVSYS/board/SConscript b/bsp/maxim/MAX32660_EVSYS/board/SConscript index 88b9fd6563d..19184e9f51d 100644 --- a/bsp/maxim/MAX32660_EVSYS/board/SConscript +++ b/bsp/maxim/MAX32660_EVSYS/board/SConscript @@ -15,11 +15,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/GCC/startup_max32660.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/ARM/startup_max32660.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/MAX32660PeriphDriver/CMSIS/Device/Maxim/MAX32660/Source/ARM/startup_max32660.s'] diff --git a/bsp/maxim/MAX32660_EVSYS/rtconfig.py b/bsp/maxim/MAX32660_EVSYS/rtconfig.py index dbb190a93da..7e7dab0f738 100644 --- a/bsp/maxim/MAX32660_EVSYS/rtconfig.py +++ b/bsp/maxim/MAX32660_EVSYS/rtconfig.py @@ -86,7 +86,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/microchip/samc21/SConstruct b/bsp/microchip/samc21/SConstruct index 9f8b13d9cf2..1a7569d7b8f 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 c1e872bb18a..8dd9b66e1f8 100644 --- a/bsp/microchip/samc21/bsp/SConscript +++ b/bsp/microchip/samc21/bsp/SConscript @@ -31,13 +31,13 @@ src += [cwd + '/atmel_start.c'] src += [cwd + '/driver_init.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/samc21/gcc/system_samc21.c'] src += [cwd + '/samc21/gcc/gcc/startup_samc21.c'] 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/samc21/rtconfig.py b/bsp/microchip/samc21/rtconfig.py index 61d50ab753f..74e0d5a3bd5 100644 --- a/bsp/microchip/samc21/rtconfig.py +++ b/bsp/microchip/samc21/rtconfig.py @@ -25,8 +25,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') diff --git a/bsp/microchip/same54/SConstruct b/bsp/microchip/same54/SConstruct index 9f8b13d9cf2..1a7569d7b8f 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 64dd7537292..579242efa82 100644 --- a/bsp/microchip/same54/bsp/SConscript +++ b/bsp/microchip/same54/bsp/SConscript @@ -35,13 +35,13 @@ src += [cwd + '/driver_init.c'] src += [cwd + '/ethernet_phy_main.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/gcc/system_same54.c'] src += [cwd + '/gcc/gcc/startup_same54.c'] 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/same54/rtconfig.py b/bsp/microchip/same54/rtconfig.py index 61f9e4cc1a7..a1076592e48 100644 --- a/bsp/microchip/same54/rtconfig.py +++ b/bsp/microchip/same54/rtconfig.py @@ -27,8 +27,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') diff --git a/bsp/microchip/same70/SConstruct b/bsp/microchip/same70/SConstruct index 9f8b13d9cf2..1a7569d7b8f 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 f65a9b9b376..28b8d6cadc6 100644 --- a/bsp/microchip/same70/bsp/SConscript +++ b/bsp/microchip/same70/bsp/SConscript @@ -29,13 +29,13 @@ src += [cwd + '/driver_init.c'] src += [cwd + '/ethernet_phy_main.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/same70b/gcc/system_same70q21b.c'] src += [cwd + '/same70b/gcc/gcc/startup_same70q21b.c'] 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/same70/rtconfig.py b/bsp/microchip/same70/rtconfig.py index be5cf773d59..8f54bc28fd0 100644 --- a/bsp/microchip/same70/rtconfig.py +++ b/bsp/microchip/same70/rtconfig.py @@ -27,8 +27,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') diff --git a/bsp/microchip/saml10/SConstruct b/bsp/microchip/saml10/SConstruct index 9f8b13d9cf2..1a7569d7b8f 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 1879b3e156e..54f1cdd2490 100644 --- a/bsp/microchip/saml10/bsp/SConscript +++ b/bsp/microchip/saml10/bsp/SConscript @@ -28,13 +28,13 @@ src += [cwd + '/atmel_start.c'] src += [cwd + '/driver_init.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/gcc/system_saml10e16a.c'] src += [cwd + '/gcc/gcc/startup_saml10e16a.c'] 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'] diff --git a/bsp/microchip/saml10/rtconfig.py b/bsp/microchip/saml10/rtconfig.py index 46ce7f12555..17ed6713df3 100644 --- a/bsp/microchip/saml10/rtconfig.py +++ b/bsp/microchip/saml10/rtconfig.py @@ -25,8 +25,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') diff --git a/bsp/mini2440/rtconfig.py b/bsp/mini2440/rtconfig.py index f8332f1e6cd..afeec633afe 100644 --- a/bsp/mini2440/rtconfig.py +++ b/bsp/mini2440/rtconfig.py @@ -92,7 +92,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'armcc' AS = 'armasm' diff --git a/bsp/mm32f103x/Libraries/SConscript b/bsp/mm32f103x/Libraries/SConscript index 4d2f0588a68..2d4f2b33716 100644 --- a/bsp/mm32f103x/Libraries/SConscript +++ b/bsp/mm32f103x/Libraries/SConscript @@ -9,7 +9,7 @@ CPPDEFINES = ['USE_STDPERIPH_DRIVER'] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MM32F103/Source/KEIL_StartAsm/startup_MM32F103.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['MM32F103/Source/IAR_StartAsm/startup_MM32F103.s'] group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/mm32f103x/SConstruct b/bsp/mm32f103x/SConstruct index afbbe07947f..9c29eeb2b5b 100644 --- a/bsp/mm32f103x/SConstruct +++ b/bsp/mm32f103x/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/mm32f103x/rtconfig.py b/bsp/mm32f103x/rtconfig.py index 1e87cf72e0d..78f52f55e96 100644 --- a/bsp/mm32f103x/rtconfig.py +++ b/bsp/mm32f103x/rtconfig.py @@ -21,7 +21,7 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' if os.getenv('RTT_EXEC_PATH'): @@ -86,7 +86,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/mm32f327x/Libraries/SConscript b/bsp/mm32f327x/Libraries/SConscript index 8141d25bc11..1b178b97f89 100644 --- a/bsp/mm32f327x/Libraries/SConscript +++ b/bsp/mm32f327x/Libraries/SConscript @@ -9,7 +9,7 @@ CPPDEFINES = ['USE_STDPERIPH_DRIVER'] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MM32F327x/Source/KEIL_StartAsm/startup_mm32f327x_keil.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['MM32F327x/Source/IAR_StartAsm/startup_mm32f327x_iar.s'] group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/mm32f327x/SConstruct b/bsp/mm32f327x/SConstruct index afbbe07947f..9c29eeb2b5b 100644 --- a/bsp/mm32f327x/SConstruct +++ b/bsp/mm32f327x/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/mm32f327x/rtconfig.py b/bsp/mm32f327x/rtconfig.py index 1e87cf72e0d..78f52f55e96 100644 --- a/bsp/mm32f327x/rtconfig.py +++ b/bsp/mm32f327x/rtconfig.py @@ -21,7 +21,7 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' if os.getenv('RTT_EXEC_PATH'): @@ -86,7 +86,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/mm32l07x/Libraries/SConscript b/bsp/mm32l07x/Libraries/SConscript index 97203552444..2bbf66e49a3 100644 --- a/bsp/mm32l07x/Libraries/SConscript +++ b/bsp/mm32l07x/Libraries/SConscript @@ -7,11 +7,11 @@ CPPPATH = [cwd + '/CMSIS/CORE', cwd + '/MM32L0xx/Include', cwd + '/MM32L0xx/Sou src += Glob('MM32L0xx/HAL_lib/src/*.c') CPPDEFINES = ['USE_STDPERIPH_DRIVER'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['MM32L0xx/Source/GCC_StartAsm/startup_MM32L0xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MM32L0xx/Source/KEIL_StartAsm/startup_MM32L0xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['MM32L0xx/Source/IAR_StartAsm/startup_MM32L0xx.s'] group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/mm32l07x/SConstruct b/bsp/mm32l07x/SConstruct index afbbe07947f..9c29eeb2b5b 100644 --- a/bsp/mm32l07x/SConstruct +++ b/bsp/mm32l07x/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/mm32l07x/rtconfig.py b/bsp/mm32l07x/rtconfig.py index 92983b6e941..2194a68adf9 100644 --- a/bsp/mm32l07x/rtconfig.py +++ b/bsp/mm32l07x/rtconfig.py @@ -21,7 +21,7 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' if os.getenv('RTT_EXEC_PATH'): @@ -86,7 +86,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/mm32l3xx/Libraries/SConscript b/bsp/mm32l3xx/Libraries/SConscript index 4190085e289..0c1186fa316 100644 --- a/bsp/mm32l3xx/Libraries/SConscript +++ b/bsp/mm32l3xx/Libraries/SConscript @@ -9,7 +9,7 @@ CPPDEFINES = ['USE_STDPERIPH_DRIVER'] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MM32L3xx/Source/KEIL_StartAsm/startup_MM32L3xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['MM32L3xx/Source/IAR_StartAsm/startup_MM32L3xx.s'] group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/mm32l3xx/SConstruct b/bsp/mm32l3xx/SConstruct index afbbe07947f..9c29eeb2b5b 100644 --- a/bsp/mm32l3xx/SConstruct +++ b/bsp/mm32l3xx/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/mm32l3xx/rtconfig.py b/bsp/mm32l3xx/rtconfig.py index 1e87cf72e0d..78f52f55e96 100644 --- a/bsp/mm32l3xx/rtconfig.py +++ b/bsp/mm32l3xx/rtconfig.py @@ -21,7 +21,7 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' if os.getenv('RTT_EXEC_PATH'): @@ -86,7 +86,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/n32g452xx/n32g452xx-mini-system/SConstruct b/bsp/n32g452xx/n32g452xx-mini-system/SConstruct index cd2bd800d3e..e68bf958e87 100755 --- a/bsp/n32g452xx/n32g452xx-mini-system/SConstruct +++ b/bsp/n32g452xx/n32g452xx-mini-system/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/n32g452xx/n32g452xx-mini-system/board/SConscript b/bsp/n32g452xx/n32g452xx-mini-system/board/SConscript index 5a7daeddaa8..0f4d045002e 100755 --- a/bsp/n32g452xx/n32g452xx-mini-system/board/SConscript +++ b/bsp/n32g452xx/n32g452xx-mini-system/board/SConscript @@ -17,7 +17,7 @@ path += [cwd + '/msp'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/N32_Std_Driver/CMSIS/device/startup/startup_n32g45x_gcc.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/N32_Std_Driver/CMSIS/device/startup/startup_n32g45x.s'] diff --git a/bsp/n32g452xx/n32g452xx-mini-system/rtconfig.py b/bsp/n32g452xx/n32g452xx-mini-system/rtconfig.py index 9e1e88529ab..c7cbe3fb648 100755 --- a/bsp/n32g452xx/n32g452xx-mini-system/rtconfig.py +++ b/bsp/n32g452xx/n32g452xx-mini-system/rtconfig.py @@ -30,9 +30,9 @@ if ('EXEC_PATH' in dir()) == False: EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' if ('EXEC_PATH' in dir()) == False: - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' BUILD = 'debug' @@ -99,7 +99,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git "a/bsp/nrf5x/docs/nRF5x\347\263\273\345\210\227BSP\345\210\266\344\275\234\346\225\231\347\250\213.md" "b/bsp/nrf5x/docs/nRF5x\347\263\273\345\210\227BSP\345\210\266\344\275\234\346\225\231\347\250\213.md" index 761db1bde93..651bb0f9b6f 100644 --- "a/bsp/nrf5x/docs/nRF5x\347\263\273\345\210\227BSP\345\210\266\344\275\234\346\225\231\347\250\213.md" +++ "b/bsp/nrf5x/docs/nRF5x\347\263\273\345\210\227BSP\345\210\266\344\275\234\346\225\231\347\250\213.md" @@ -53,7 +53,7 @@ elif GetDepend('SOC_NRF51822') == True: if rtconfig.PLATFORM == 'gcc': src += ['./mdk/gcc_startup_nrf51.S'] - if rtconfig.PLATFORM == 'iar': + if rtconfig.PLATFORM == 'iccarm': D_SRC += ['./mdk/iar_startup_nrf51.s'] ``` diff --git a/bsp/nrf5x/libraries/templates/nrfx/SConstruct b/bsp/nrf5x/libraries/templates/nrfx/SConstruct index 798344bc7f9..b7857b2e116 100644 --- a/bsp/nrf5x/libraries/templates/nrfx/SConstruct +++ b/bsp/nrf5x/libraries/templates/nrfx/SConstruct @@ -25,7 +25,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/nrf5x/nrf51822/SConstruct b/bsp/nrf5x/nrf51822/SConstruct index 798344bc7f9..b7857b2e116 100644 --- a/bsp/nrf5x/nrf51822/SConstruct +++ b/bsp/nrf5x/nrf51822/SConstruct @@ -25,7 +25,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/nrf5x/nrf52832/SConstruct b/bsp/nrf5x/nrf52832/SConstruct index 798344bc7f9..b7857b2e116 100644 --- a/bsp/nrf5x/nrf52832/SConstruct +++ b/bsp/nrf5x/nrf52832/SConstruct @@ -25,7 +25,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/nrf5x/nrf52833/SConstruct b/bsp/nrf5x/nrf52833/SConstruct index 798344bc7f9..b7857b2e116 100644 --- a/bsp/nrf5x/nrf52833/SConstruct +++ b/bsp/nrf5x/nrf52833/SConstruct @@ -25,7 +25,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/nrf5x/nrf52840/SConstruct b/bsp/nrf5x/nrf52840/SConstruct index 798344bc7f9..b7857b2e116 100644 --- a/bsp/nrf5x/nrf52840/SConstruct +++ b/bsp/nrf5x/nrf52840/SConstruct @@ -25,7 +25,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/nuvoton/libraries/m031/Device/SConscript b/bsp/nuvoton/libraries/m031/Device/SConscript index c6fdd579877..316f5d2e770 100644 --- a/bsp/nuvoton/libraries/m031/Device/SConscript +++ b/bsp/nuvoton/libraries/m031/Device/SConscript @@ -11,11 +11,11 @@ Nuvoton/M031/Source/system_M031Series.c """) # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['Nuvoton/M031/Source/GCC/startup_M031Series.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['Nuvoton/M031/Source/ARM/startup_M031Series.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['Nuvoton/M031/Source/IAR/startup_M031Series.s'] path = [cwd + '/Nuvoton/M031/Include',] diff --git a/bsp/nuvoton/libraries/m031/StdDriver/SConscript b/bsp/nuvoton/libraries/m031/StdDriver/SConscript index c24f15f4725..b01b6766d99 100644 --- a/bsp/nuvoton/libraries/m031/StdDriver/SConscript +++ b/bsp/nuvoton/libraries/m031/StdDriver/SConscript @@ -14,7 +14,7 @@ if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): libs += ['libstddriver_keil'] elif GetOption('target') == 'mdk4' and os.path.isfile('./lib/libstddriver_keil4.lib'): libs += ['libstddriver_keil4'] - elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./lib/libstddriver_gcc.a'): + elif rtconfig.PLATFORM in ['gcc'] and os.path.isfile('./lib/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] elif os.path.isfile('./lib/libstddriver_iar.a'): libs += ['libstddriver_iar'] diff --git a/bsp/nuvoton/libraries/m2354/Device/SConscript b/bsp/nuvoton/libraries/m2354/Device/SConscript index a823d0a3807..6d119ce4086 100644 --- a/bsp/nuvoton/libraries/m2354/Device/SConscript +++ b/bsp/nuvoton/libraries/m2354/Device/SConscript @@ -11,11 +11,11 @@ Nuvoton/M2354/Source/system_M2354.c """) # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['Nuvoton/M2354/Source/GCC/startup_M2354.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['Nuvoton/M2354/Source/ARM/startup_M2354.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['Nuvoton/M2354/Source/IAR/startup_M2354.s'] path = [cwd + '/Nuvoton/M2354/Include',] diff --git a/bsp/nuvoton/libraries/m2354/StdDriver/SConscript b/bsp/nuvoton/libraries/m2354/StdDriver/SConscript index c24f15f4725..b01b6766d99 100644 --- a/bsp/nuvoton/libraries/m2354/StdDriver/SConscript +++ b/bsp/nuvoton/libraries/m2354/StdDriver/SConscript @@ -14,7 +14,7 @@ if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): libs += ['libstddriver_keil'] elif GetOption('target') == 'mdk4' and os.path.isfile('./lib/libstddriver_keil4.lib'): libs += ['libstddriver_keil4'] - elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./lib/libstddriver_gcc.a'): + elif rtconfig.PLATFORM in ['gcc'] and os.path.isfile('./lib/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] elif os.path.isfile('./lib/libstddriver_iar.a'): libs += ['libstddriver_iar'] diff --git a/bsp/nuvoton/libraries/m480/Device/SConscript b/bsp/nuvoton/libraries/m480/Device/SConscript index 42f37b3a870..ea24c630d77 100644 --- a/bsp/nuvoton/libraries/m480/Device/SConscript +++ b/bsp/nuvoton/libraries/m480/Device/SConscript @@ -11,11 +11,11 @@ Nuvoton/M480/Source/system_M480.c """) # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['Nuvoton/M480/Source/GCC/startup_M480.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['Nuvoton/M480/Source/ARM/startup_M480.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['Nuvoton/M480/Source/IAR/startup_M480.s'] path = [cwd + '/Nuvoton/M480/Include',] diff --git a/bsp/nuvoton/libraries/m480/StdDriver/SConscript b/bsp/nuvoton/libraries/m480/StdDriver/SConscript index c24f15f4725..b01b6766d99 100644 --- a/bsp/nuvoton/libraries/m480/StdDriver/SConscript +++ b/bsp/nuvoton/libraries/m480/StdDriver/SConscript @@ -14,7 +14,7 @@ if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): libs += ['libstddriver_keil'] elif GetOption('target') == 'mdk4' and os.path.isfile('./lib/libstddriver_keil4.lib'): libs += ['libstddriver_keil4'] - elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./lib/libstddriver_gcc.a'): + elif rtconfig.PLATFORM in ['gcc'] and os.path.isfile('./lib/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] elif os.path.isfile('./lib/libstddriver_iar.a'): libs += ['libstddriver_iar'] diff --git a/bsp/nuvoton/libraries/n9h30/Driver/SConscript b/bsp/nuvoton/libraries/n9h30/Driver/SConscript index f0af26837ea..9b4fef5f2db 100644 --- a/bsp/nuvoton/libraries/n9h30/Driver/SConscript +++ b/bsp/nuvoton/libraries/n9h30/Driver/SConscript @@ -14,7 +14,7 @@ if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): libs += ['libstddriver_keil4'] if GetOption('target') == 'mdk5' and os.path.isfile('./Library/libstddriver_keil.lib'): libs += ['libstddriver_keil'] - elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./Library/libstddriver_gcc.a'): + elif rtconfig.PLATFORM in ['gcc'] and os.path.isfile('./Library/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] if not libs: diff --git a/bsp/nuvoton/libraries/nuc980/Driver/SConscript b/bsp/nuvoton/libraries/nuc980/Driver/SConscript index f0af26837ea..9b4fef5f2db 100644 --- a/bsp/nuvoton/libraries/nuc980/Driver/SConscript +++ b/bsp/nuvoton/libraries/nuc980/Driver/SConscript @@ -14,7 +14,7 @@ if not GetDepend('BSP_USE_STDDRIVER_SOURCE'): libs += ['libstddriver_keil4'] if GetOption('target') == 'mdk5' and os.path.isfile('./Library/libstddriver_keil.lib'): libs += ['libstddriver_keil'] - elif rtconfig.PLATFORM == 'gcc' and os.path.isfile('./Library/libstddriver_gcc.a'): + elif rtconfig.PLATFORM in ['gcc'] and os.path.isfile('./Library/libstddriver_gcc.a'): libs += ['libstddriver_gcc'] if not libs: diff --git a/bsp/nuvoton/numaker-iot-m487/SConstruct b/bsp/nuvoton/numaker-iot-m487/SConstruct index cc38eb1ecc4..f4c3214c30e 100644 --- a/bsp/nuvoton/numaker-iot-m487/SConstruct +++ b/bsp/nuvoton/numaker-iot-m487/SConstruct @@ -25,7 +25,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/nuvoton/numaker-iot-m487/rtconfig.py b/bsp/nuvoton/numaker-iot-m487/rtconfig.py index 180fc90efa4..4e398961d87 100644 --- a/bsp/nuvoton/numaker-iot-m487/rtconfig.py +++ b/bsp/nuvoton/numaker-iot-m487/rtconfig.py @@ -20,7 +20,7 @@ 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'): @@ -88,7 +88,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/nuvoton/numaker-m032ki/SConstruct b/bsp/nuvoton/numaker-m032ki/SConstruct index b4306309163..448c5353b18 100644 --- a/bsp/nuvoton/numaker-m032ki/SConstruct +++ b/bsp/nuvoton/numaker-m032ki/SConstruct @@ -25,7 +25,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/nuvoton/numaker-m032ki/rtconfig.py b/bsp/nuvoton/numaker-m032ki/rtconfig.py index ba712aa8066..e773f34a1f5 100644 --- a/bsp/nuvoton/numaker-m032ki/rtconfig.py +++ b/bsp/nuvoton/numaker-m032ki/rtconfig.py @@ -20,7 +20,7 @@ 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'): @@ -87,7 +87,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/nuvoton/numaker-m2354/SConstruct b/bsp/nuvoton/numaker-m2354/SConstruct index 28fa08c9d61..4b77f1a7363 100644 --- a/bsp/nuvoton/numaker-m2354/SConstruct +++ b/bsp/nuvoton/numaker-m2354/SConstruct @@ -25,7 +25,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/nuvoton/numaker-m2354/rtconfig.py b/bsp/nuvoton/numaker-m2354/rtconfig.py index df687dafb11..71272644e1f 100644 --- a/bsp/nuvoton/numaker-m2354/rtconfig.py +++ b/bsp/nuvoton/numaker-m2354/rtconfig.py @@ -20,7 +20,7 @@ PLATFORM = 'armclang' 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'): @@ -87,7 +87,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/nuvoton/numaker-pfm-m487/SConstruct b/bsp/nuvoton/numaker-pfm-m487/SConstruct index cc38eb1ecc4..f4c3214c30e 100644 --- a/bsp/nuvoton/numaker-pfm-m487/SConstruct +++ b/bsp/nuvoton/numaker-pfm-m487/SConstruct @@ -25,7 +25,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/nuvoton/numaker-pfm-m487/rtconfig.py b/bsp/nuvoton/numaker-pfm-m487/rtconfig.py index 180fc90efa4..4e398961d87 100644 --- a/bsp/nuvoton/numaker-pfm-m487/rtconfig.py +++ b/bsp/nuvoton/numaker-pfm-m487/rtconfig.py @@ -20,7 +20,7 @@ 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'): @@ -88,7 +88,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/nv32f100x/SConstruct b/bsp/nv32f100x/SConstruct index d4fd389691f..b943bd2ba9a 100644 --- a/bsp/nv32f100x/SConstruct +++ b/bsp/nv32f100x/SConstruct @@ -20,7 +20,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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) diff --git a/bsp/nv32f100x/rtconfig.py b/bsp/nv32f100x/rtconfig.py index 7e1e24facd0..6852728f1f5 100644 --- a/bsp/nv32f100x/rtconfig.py +++ b/bsp/nv32f100x/rtconfig.py @@ -86,7 +86,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/qemu-vexpress-gemini/cpu/SConscript b/bsp/qemu-vexpress-gemini/cpu/SConscript index d845dc486a8..9c276325037 100644 --- a/bsp/qemu-vexpress-gemini/cpu/SConscript +++ b/bsp/qemu-vexpress-gemini/cpu/SConscript @@ -5,9 +5,9 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -elif rtconfig.PLATFORM == 'gcc': +elif rtconfig.PLATFORM in ['gcc']: src += Glob('*_gcc.S') elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') diff --git a/bsp/raspberry-pico/rtconfig.py b/bsp/raspberry-pico/rtconfig.py index 3ce354b9ca5..08a550fbccb 100644 --- a/bsp/raspberry-pico/rtconfig.py +++ b/bsp/raspberry-pico/rtconfig.py @@ -24,8 +24,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') diff --git a/bsp/renesas/libraries/bsp-template/SConscript b/bsp/renesas/libraries/bsp-template/SConscript index 8c8b1c92c86..6a57c550af0 100644 --- a/bsp/renesas/libraries/bsp-template/SConscript +++ b/bsp/renesas/libraries/bsp-template/SConscript @@ -9,10 +9,10 @@ src = [] CPPPATH = [] list = os.listdir(cwd) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc': +elif rtconfig.PLATFORM in ['gcc']: CPPPATH = [cwd] src = Glob('./src/*.c') elif rtconfig.PLATFORM == 'armclang': diff --git a/bsp/renesas/libraries/bsp-template/SConstruct b/bsp/renesas/libraries/bsp-template/SConstruct index 4a16be573d8..d00d0dbeaac 100644 --- a/bsp/renesas/libraries/bsp-template/SConstruct +++ b/bsp/renesas/libraries/bsp-template/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/renesas/libraries/bsp-template/board/ports/SConscript b/bsp/renesas/libraries/bsp-template/board/ports/SConscript index 41d6147b100..6df0a4f30f8 100644 --- a/bsp/renesas/libraries/bsp-template/board/ports/SConscript +++ b/bsp/renesas/libraries/bsp-template/board/ports/SConscript @@ -12,7 +12,7 @@ if GetDepend(['BSP_USING_RW007']): CPPPATH = [cwd] LOCAL_CFLAGS = '' -if rtconfig.PLATFORM == 'gcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['gcc'] or rtconfig.PLATFORM == 'armclang': LOCAL_CFLAGS += ' -std=c99' elif rtconfig.PLATFORM == 'armcc': LOCAL_CFLAGS += ' --c99' diff --git a/bsp/renesas/libraries/bsp-template/ra/SConscript b/bsp/renesas/libraries/bsp-template/ra/SConscript index fd53aae32f6..ec190608c87 100644 --- a/bsp/renesas/libraries/bsp-template/ra/SConscript +++ b/bsp/renesas/libraries/bsp-template/ra/SConscript @@ -7,10 +7,10 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc': +elif rtconfig.PLATFORM in ['gcc']: src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c') src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c'] src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c'] diff --git a/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript b/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript index b059da45f9f..2d02f21e9b5 100644 --- a/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript +++ b/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript @@ -7,10 +7,10 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc': +elif rtconfig.PLATFORM in ['gcc']: src = Glob('*.c') CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp'] elif rtconfig.PLATFORM == 'armclang': diff --git a/bsp/renesas/libraries/bsp-template/ra_gen/SConscript b/bsp/renesas/libraries/bsp-template/ra_gen/SConscript index 40ab0bdf612..bbf3579ec9e 100644 --- a/bsp/renesas/libraries/bsp-template/ra_gen/SConscript +++ b/bsp/renesas/libraries/bsp-template/ra_gen/SConscript @@ -7,10 +7,10 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc': +elif rtconfig.PLATFORM in ['gcc']: src = Glob('*.c') CPPPATH = [cwd, ] elif rtconfig.PLATFORM == 'armclang': diff --git a/bsp/renesas/libraries/bsp-template/rtconfig.py b/bsp/renesas/libraries/bsp-template/rtconfig.py index 9a404b2dfaf..f03ce7604dd 100644 --- a/bsp/renesas/libraries/bsp-template/rtconfig.py +++ b/bsp/renesas/libraries/bsp-template/rtconfig.py @@ -20,7 +20,7 @@ PLATFORM = 'armclang' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 8.0' if os.getenv('RTT_EXEC_PATH'): diff --git a/bsp/renesas/ra6m4-cpk/SConscript b/bsp/renesas/ra6m4-cpk/SConscript index 8c8b1c92c86..6a57c550af0 100644 --- a/bsp/renesas/ra6m4-cpk/SConscript +++ b/bsp/renesas/ra6m4-cpk/SConscript @@ -9,10 +9,10 @@ src = [] CPPPATH = [] list = os.listdir(cwd) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc': +elif rtconfig.PLATFORM in ['gcc']: CPPPATH = [cwd] src = Glob('./src/*.c') elif rtconfig.PLATFORM == 'armclang': diff --git a/bsp/renesas/ra6m4-cpk/SConstruct b/bsp/renesas/ra6m4-cpk/SConstruct index 4a16be573d8..d00d0dbeaac 100644 --- a/bsp/renesas/ra6m4-cpk/SConstruct +++ b/bsp/renesas/ra6m4-cpk/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/renesas/ra6m4-cpk/board/ports/SConscript b/bsp/renesas/ra6m4-cpk/board/ports/SConscript index 41d6147b100..6df0a4f30f8 100644 --- a/bsp/renesas/ra6m4-cpk/board/ports/SConscript +++ b/bsp/renesas/ra6m4-cpk/board/ports/SConscript @@ -12,7 +12,7 @@ if GetDepend(['BSP_USING_RW007']): CPPPATH = [cwd] LOCAL_CFLAGS = '' -if rtconfig.PLATFORM == 'gcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['gcc'] or rtconfig.PLATFORM == 'armclang': LOCAL_CFLAGS += ' -std=c99' elif rtconfig.PLATFORM == 'armcc': LOCAL_CFLAGS += ' --c99' diff --git a/bsp/renesas/ra6m4-cpk/ra/SConscript b/bsp/renesas/ra6m4-cpk/ra/SConscript index fd53aae32f6..ec190608c87 100644 --- a/bsp/renesas/ra6m4-cpk/ra/SConscript +++ b/bsp/renesas/ra6m4-cpk/ra/SConscript @@ -7,10 +7,10 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc': +elif rtconfig.PLATFORM in ['gcc']: src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c') src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c'] src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c'] diff --git a/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript b/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript index 21f29eb460a..698fd28ee0e 100644 --- a/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript +++ b/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript @@ -7,11 +7,11 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc': +elif rtconfig.PLATFORM in ['gcc']: src = Glob('*.c') CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp'] elif rtconfig.PLATFORM == 'armclang': diff --git a/bsp/renesas/ra6m4-cpk/ra_gen/SConscript b/bsp/renesas/ra6m4-cpk/ra_gen/SConscript index 5fb4a860df2..9f35703f505 100644 --- a/bsp/renesas/ra6m4-cpk/ra_gen/SConscript +++ b/bsp/renesas/ra6m4-cpk/ra_gen/SConscript @@ -7,10 +7,10 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc' : +elif rtconfig.PLATFORM in ['gcc'] : src = Glob('*.c') CPPPATH = [cwd, ] elif rtconfig.PLATFORM == 'armclang': diff --git a/bsp/renesas/ra6m4-cpk/rtconfig.py b/bsp/renesas/ra6m4-cpk/rtconfig.py index 16968de0db2..9565e9fad49 100644 --- a/bsp/renesas/ra6m4-cpk/rtconfig.py +++ b/bsp/renesas/ra6m4-cpk/rtconfig.py @@ -20,7 +20,7 @@ PLATFORM = 'armclang' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 8.0' if os.getenv('RTT_EXEC_PATH'): diff --git a/bsp/renesas/ra6m4-iot/SConscript b/bsp/renesas/ra6m4-iot/SConscript index 56916d12c65..f06753e8446 100644 --- a/bsp/renesas/ra6m4-iot/SConscript +++ b/bsp/renesas/ra6m4-iot/SConscript @@ -9,10 +9,10 @@ src = [] CPPPATH = [] list = os.listdir(cwd) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc' : +elif rtconfig.PLATFORM in ['gcc'] : CPPPATH = [cwd] src = Glob('./src/*.c') elif rtconfig.PLATFORM == 'armclang': diff --git a/bsp/renesas/ra6m4-iot/SConstruct b/bsp/renesas/ra6m4-iot/SConstruct index 4a16be573d8..d00d0dbeaac 100644 --- a/bsp/renesas/ra6m4-iot/SConstruct +++ b/bsp/renesas/ra6m4-iot/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/renesas/ra6m4-iot/board/ports/SConscript b/bsp/renesas/ra6m4-iot/board/ports/SConscript index 41d6147b100..6df0a4f30f8 100644 --- a/bsp/renesas/ra6m4-iot/board/ports/SConscript +++ b/bsp/renesas/ra6m4-iot/board/ports/SConscript @@ -12,7 +12,7 @@ if GetDepend(['BSP_USING_RW007']): CPPPATH = [cwd] LOCAL_CFLAGS = '' -if rtconfig.PLATFORM == 'gcc' or rtconfig.PLATFORM == 'armclang': +if rtconfig.PLATFORM in ['gcc'] or rtconfig.PLATFORM == 'armclang': LOCAL_CFLAGS += ' -std=c99' elif rtconfig.PLATFORM == 'armcc': LOCAL_CFLAGS += ' --c99' diff --git a/bsp/renesas/ra6m4-iot/ra/SConscript b/bsp/renesas/ra6m4-iot/ra/SConscript index 60838363585..346f20faf7b 100644 --- a/bsp/renesas/ra6m4-iot/ra/SConscript +++ b/bsp/renesas/ra6m4-iot/ra/SConscript @@ -7,10 +7,10 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc' : +elif rtconfig.PLATFORM in ['gcc'] : src += Glob(cwd + '/fsp/src/bsp/mcu/all/*.c') src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.c'] src += [cwd + '/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.c'] diff --git a/bsp/renesas/ra6m4-iot/ra_cfg/SConscript b/bsp/renesas/ra6m4-iot/ra_cfg/SConscript index 3f03930232c..d4a8e563975 100644 --- a/bsp/renesas/ra6m4-iot/ra_cfg/SConscript +++ b/bsp/renesas/ra6m4-iot/ra_cfg/SConscript @@ -7,10 +7,10 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc' : +elif rtconfig.PLATFORM in ['gcc'] : src = Glob('*.c') CPPPATH = [cwd+'/fsp_cfg', cwd + '/fsp_cfg/bsp'] elif rtconfig.PLATFORM == 'armclang': diff --git a/bsp/renesas/ra6m4-iot/ra_gen/SConscript b/bsp/renesas/ra6m4-iot/ra_gen/SConscript index 5fb4a860df2..9f35703f505 100644 --- a/bsp/renesas/ra6m4-iot/ra_gen/SConscript +++ b/bsp/renesas/ra6m4-iot/ra_gen/SConscript @@ -7,10 +7,10 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') -elif rtconfig.PLATFORM == 'gcc' : +elif rtconfig.PLATFORM in ['gcc'] : src = Glob('*.c') CPPPATH = [cwd, ] elif rtconfig.PLATFORM == 'armclang': diff --git a/bsp/renesas/ra6m4-iot/rtconfig.py b/bsp/renesas/ra6m4-iot/rtconfig.py index 9a404b2dfaf..f03ce7604dd 100644 --- a/bsp/renesas/ra6m4-iot/rtconfig.py +++ b/bsp/renesas/ra6m4-iot/rtconfig.py @@ -20,7 +20,7 @@ PLATFORM = 'armclang' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 8.0' if os.getenv('RTT_EXEC_PATH'): diff --git a/bsp/rm48x50/rtconfig.py b/bsp/rm48x50/rtconfig.py index 0c11dc8d594..4be1cc26f10 100644 --- a/bsp/rm48x50/rtconfig.py +++ b/bsp/rm48x50/rtconfig.py @@ -88,7 +88,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/sam7x/rtconfig.py b/bsp/sam7x/rtconfig.py index 2a3c76adde4..9b0113f8f1a 100644 --- a/bsp/sam7x/rtconfig.py +++ b/bsp/sam7x/rtconfig.py @@ -81,7 +81,7 @@ POST_ACTION = 'fromelf --i32 $TARGET --output rtthread-sam7x.hex \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'armcc' AS = 'armasm' diff --git a/bsp/samd21/SConstruct b/bsp/samd21/SConstruct index 44b6fc738b6..8adc9f48a00 100644 --- a/bsp/samd21/SConstruct +++ b/bsp/samd21/SConstruct @@ -20,7 +20,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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map project.map']) diff --git a/bsp/samd21/sam_d2x_asflib/SConscript b/bsp/samd21/sam_d2x_asflib/SConscript index 079178a9b22..ac81dff1a96 100644 --- a/bsp/samd21/sam_d2x_asflib/SConscript +++ b/bsp/samd21/sam_d2x_asflib/SConscript @@ -31,7 +31,7 @@ if rtconfig.DEVICE_SERIES == 'SAMD20': path += [cwd + '/sam0/', cwd + '/sam0/utils/cmsis/samd20/include/'] path += [cwd + '/sam0/utils/cmsis/samd20/source/'] src += Glob('./sam0/utils/cmsis/samd20/source/*.c') - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: src += Glob('./sam0/utils/cmsis/samd20/source/gcc/*.s') elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('./sam0/utils/cmsis/samd20/source/arm/*.s') @@ -40,7 +40,7 @@ elif rtconfig.DEVICE_SERIES == 'SAMD21': path += [cwd + '/sam0/utils/cmsis/samd21/include/'] path += [cwd + '/sam0/utils/cmsis/samd21/source/'] src += Glob('./sam0/utils/cmsis/samd21/source/*.c') - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: src += Glob('./sam0/utils/cmsis/samd21/source/gcc/*.s') elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('./sam0/utils/cmsis/samd21/source/arm/*.s') diff --git a/bsp/smartfusion2/CMSIS/SConscript b/bsp/smartfusion2/CMSIS/SConscript index 157d672a0b5..0d75bbaf8ab 100644 --- a/bsp/smartfusion2/CMSIS/SConscript +++ b/bsp/smartfusion2/CMSIS/SConscript @@ -4,7 +4,7 @@ import rtconfig cwd = GetCurrentDir() src = Glob('*.c') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['startup_gcc/startup_m2sxxx.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: diff --git a/bsp/stm32/libraries/templates/stm32f0xx/SConstruct b/bsp/stm32/libraries/templates/stm32f0xx/SConstruct index 277821b12c9..58a2c139bc4 100644 --- a/bsp/stm32/libraries/templates/stm32f0xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f0xx/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/libraries/templates/stm32f0xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript index de50dc84112..ec812863ada 100644 --- a/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc/startup_stm32f091xc.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/arm/startup_stm32f091xc.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/iar/startup_stm32f091xc.s'] # STM32F030x6 || STM32F030x8 || STM32F031x6 diff --git a/bsp/stm32/libraries/templates/stm32f0xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32f0xx/rtconfig.py index 46e0bedc923..9b8d8076e01 100644 --- a/bsp/stm32/libraries/templates/stm32f0xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32f0xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32f10x/SConstruct b/bsp/stm32/libraries/templates/stm32f10x/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f10x/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/libraries/templates/stm32f10x/board/SConscript b/bsp/stm32/libraries/templates/stm32f10x/board/SConscript index e3f18433605..ed630f8b21f 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f10x/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] 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/libraries/templates/stm32f10x/rtconfig.py b/bsp/stm32/libraries/templates/stm32f10x/rtconfig.py index 85d76eb6230..7ed928ddba7 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32f10x/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32f2xx/SConstruct b/bsp/stm32/libraries/templates/stm32f2xx/SConstruct index 3b4403a7e45..45ad323e44b 100644 --- a/bsp/stm32/libraries/templates/stm32f2xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f2xx/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/libraries/templates/stm32f2xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript index 4ee71bf9dc1..fff36bd306f 100644 --- a/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f207xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/arm/startup_stm32f207xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/iar/startup_stm32f207xx.s'] # STM32F205xx || STM32F207xx || STM32F215xx diff --git a/bsp/stm32/libraries/templates/stm32f2xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32f2xx/rtconfig.py index a7a2b3a0649..3e047b559c8 100644 --- a/bsp/stm32/libraries/templates/stm32f2xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32f2xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32f3xx/SConstruct b/bsp/stm32/libraries/templates/stm32f3xx/SConstruct index dfef5be14f2..18426367fca 100644 --- a/bsp/stm32/libraries/templates/stm32f3xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f3xx/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/libraries/templates/stm32f3xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript index cbbf9b91dee..9fe15f49639 100644 --- a/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/gcc/startup_stm32f302x8.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/arm/startup_stm32f302x8.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/iar/startup_stm32f302x8.s'] # (STM32F301x8) || (STM32F302x8) || (STM32F318xx) diff --git a/bsp/stm32/libraries/templates/stm32f3xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32f3xx/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/libraries/templates/stm32f3xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32f3xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32f4xx/SConstruct b/bsp/stm32/libraries/templates/stm32f4xx/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f4xx/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/libraries/templates/stm32f4xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript index fd34090efc5..011f03ed862 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/libraries/templates/stm32f4xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32f4xx/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32f4xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32f7xx/SConstruct b/bsp/stm32/libraries/templates/stm32f7xx/SConstruct index 1e20ca63a7b..ada3672e5fb 100644 --- a/bsp/stm32/libraries/templates/stm32f7xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32f7xx/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/libraries/templates/stm32f7xx/board/SConscript b/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript index c543f16503e..7b405b2d6c2 100644 --- a/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript @@ -14,11 +14,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] # STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || diff --git a/bsp/stm32/libraries/templates/stm32f7xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32f7xx/rtconfig.py index 39c55429eec..06215daed36 100644 --- a/bsp/stm32/libraries/templates/stm32f7xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32f7xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -126,7 +126,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32h7xx/SConstruct b/bsp/stm32/libraries/templates/stm32h7xx/SConstruct index fc6658ebc70..02c0e78cd2d 100644 --- a/bsp/stm32/libraries/templates/stm32h7xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32h7xx/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/libraries/templates/stm32h7xx/board/SConscript b/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript index ab03805d74e..2ed225df9de 100644 --- a/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript @@ -14,11 +14,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] # STM32H743xx || STM32H750xx || STM32F753xx diff --git a/bsp/stm32/libraries/templates/stm32h7xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32h7xx/rtconfig.py index 2c9cbdd7924..8da8c57718d 100644 --- a/bsp/stm32/libraries/templates/stm32h7xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32h7xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -94,7 +94,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32l1xx/SConstruct b/bsp/stm32/libraries/templates/stm32l1xx/SConstruct index 13ca54bdb99..593655f70fa 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32l1xx/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/libraries/templates/stm32l1xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript index f014eadec63..d6fad1007d1 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l1xx/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 + '/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/gcc/startup_stm32L151xb.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/arm/startup_stm32L151xb.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L1xx_HAL/CMSIS/Device/ST/STM32L1xx/Source/Templates/iar/startup_stm32L151xb.s'] CPPDEFINES = ['STM32L151xB'] diff --git a/bsp/stm32/libraries/templates/stm32l1xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32l1xx/rtconfig.py index 2f86aff321c..fa54f25493c 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32l1xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'G:/tool/keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32l4xx/SConstruct b/bsp/stm32/libraries/templates/stm32l4xx/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32l4xx/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/libraries/templates/stm32l4xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript index d042d99c955..b4ea2eea491 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l475xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l475xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l475xx.s'] # STM32L412xx || STM32L422xx || STM32L431xx diff --git a/bsp/stm32/libraries/templates/stm32l4xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32l4xx/rtconfig.py index b6c0783af56..c1f50801663 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32l4xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32l5xx/SConstruct b/bsp/stm32/libraries/templates/stm32l5xx/SConstruct index 6d1acee40bf..6a27defff65 100644 --- a/bsp/stm32/libraries/templates/stm32l5xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32l5xx/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/libraries/templates/stm32l5xx/board/SConscript b/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript index 46b55262c15..cb5f07626eb 100644 --- a/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/gcc/startup_stm32l552xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/arm/startup_stm32l552xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/iar/startup_stm32l552xx.s'] # You can select chips from the list above diff --git a/bsp/stm32/libraries/templates/stm32l5xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32l5xx/rtconfig.py index b6c0783af56..c1f50801663 100644 --- a/bsp/stm32/libraries/templates/stm32l5xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32l5xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32mp1xx/SConstruct b/bsp/stm32/libraries/templates/stm32mp1xx/SConstruct index e75b162f9d2..b66fab1255e 100644 --- a/bsp/stm32/libraries/templates/stm32mp1xx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32mp1xx/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/libraries/templates/stm32mp1xx/board/SConscript b/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript index 0e748d6d565..d86a4ff7d33 100644 --- a/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript @@ -33,11 +33,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/gcc/startup_stm32mp15xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/arm/startup_stm32mp15xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/iar/startup_stm32mp15xx.s'] CPPDEFINES = ['CORE_CM4','NO_ATOMIC_64_SUPPORT','METAL_INTERNAL','METAL_MAX_DEVICE_REGIONS=2','VIRTIO_SLAVE_ONLY','STM32MP157Axx','__LOG_TRACE_IO_'] diff --git a/bsp/stm32/libraries/templates/stm32mp1xx/rtconfig.py b/bsp/stm32/libraries/templates/stm32mp1xx/rtconfig.py index b4605791cb2..d2446f9fde5 100644 --- a/bsp/stm32/libraries/templates/stm32mp1xx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32mp1xx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/libraries/templates/stm32wbxx/SConstruct b/bsp/stm32/libraries/templates/stm32wbxx/SConstruct index 6aeca83d9f5..e4b174906bc 100644 --- a/bsp/stm32/libraries/templates/stm32wbxx/SConstruct +++ b/bsp/stm32/libraries/templates/stm32wbxx/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/libraries/templates/stm32wbxx/board/SConscript b/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript index 69fc966ade6..ddbdcaac36a 100644 --- a/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb55xx_cm4.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb55xx_cm4.s'] # You can select chips from the list above diff --git a/bsp/stm32/libraries/templates/stm32wbxx/rtconfig.py b/bsp/stm32/libraries/templates/stm32wbxx/rtconfig.py index b6c0783af56..c1f50801663 100644 --- a/bsp/stm32/libraries/templates/stm32wbxx/rtconfig.py +++ b/bsp/stm32/libraries/templates/stm32wbxx/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f072-st-nucleo/SConstruct b/bsp/stm32/stm32f072-st-nucleo/SConstruct index 1df044209c2..1cd4ca59cea 100644 --- a/bsp/stm32/stm32f072-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f072-st-nucleo/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/stm32f072-st-nucleo/board/SConscript b/bsp/stm32/stm32f072-st-nucleo/board/SConscript index 0943a47d162..011a73c9d87 100644 --- a/bsp/stm32/stm32f072-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f072-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc/startup_stm32f072xb.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/arm/startup_stm32f072xb.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/iar/startup_stm32f072xb.s'] # STM32F030x6 || STM32F030x8 || STM32F031x6 diff --git a/bsp/stm32/stm32f072-st-nucleo/rtconfig.py b/bsp/stm32/stm32f072-st-nucleo/rtconfig.py index daaefbe30a5..9818b62f9d8 100644 --- a/bsp/stm32/stm32f072-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f072-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f091-st-nucleo/SConstruct b/bsp/stm32/stm32f091-st-nucleo/SConstruct index 277821b12c9..58a2c139bc4 100644 --- a/bsp/stm32/stm32f091-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f091-st-nucleo/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/stm32f091-st-nucleo/board/SConscript b/bsp/stm32/stm32f091-st-nucleo/board/SConscript index dc2ee41f5e2..519d0cd7d7a 100644 --- a/bsp/stm32/stm32f091-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f091-st-nucleo/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/gcc/startup_stm32f091xc.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/arm/startup_stm32f091xc.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F0xx_HAL/CMSIS/Device/ST/STM32F0xx/Source/Templates/iar/startup_stm32f091xc.s'] CPPDEFINES = ['STM32F091xC'] diff --git a/bsp/stm32/stm32f091-st-nucleo/rtconfig.py b/bsp/stm32/stm32f091-st-nucleo/rtconfig.py index 17df5aa35e4..5f41e855a38 100644 --- a/bsp/stm32/stm32f091-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f091-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-atk-nano/SConstruct b/bsp/stm32/stm32f103-atk-nano/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/stm32f103-atk-nano/SConstruct +++ b/bsp/stm32/stm32f103-atk-nano/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-atk-nano/board/SConscript b/bsp/stm32/stm32f103-atk-nano/board/SConscript index b9247cacf52..8b21a72b435 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/SConscript +++ b/bsp/stm32/stm32f103-atk-nano/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'] CPPDEFINES = ['STM32F103xB'] diff --git a/bsp/stm32/stm32f103-atk-nano/rtconfig.py b/bsp/stm32/stm32f103-atk-nano/rtconfig.py index e282c015ca6..4f3ce9e99ae 100644 --- a/bsp/stm32/stm32f103-atk-nano/rtconfig.py +++ b/bsp/stm32/stm32f103-atk-nano/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-atk-warshipv3/SConstruct b/bsp/stm32/stm32f103-atk-warshipv3/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/SConstruct +++ b/bsp/stm32/stm32f103-atk-warshipv3/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-atk-warshipv3/board/SConscript b/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript index 573fcf71012..c7f9c448d29 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript +++ b/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript @@ -24,11 +24,11 @@ path += [cwd + '/ports/include'] 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-atk-warshipv3/rtconfig.py b/bsp/stm32/stm32f103-atk-warshipv3/rtconfig.py index 437e6becf65..558924a36a3 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/rtconfig.py +++ b/bsp/stm32/stm32f103-atk-warshipv3/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-blue-pill/SConstruct b/bsp/stm32/stm32f103-blue-pill/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/stm32f103-blue-pill/SConstruct +++ b/bsp/stm32/stm32f103-blue-pill/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-blue-pill/board/SConscript b/bsp/stm32/stm32f103-blue-pill/board/SConscript index e3f18433605..ed630f8b21f 100644 --- a/bsp/stm32/stm32f103-blue-pill/board/SConscript +++ b/bsp/stm32/stm32f103-blue-pill/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] 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-blue-pill/rtconfig.py b/bsp/stm32/stm32f103-blue-pill/rtconfig.py index 43e61097a22..43685c9070e 100644 --- a/bsp/stm32/stm32f103-blue-pill/rtconfig.py +++ b/bsp/stm32/stm32f103-blue-pill/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-dofly-M3S/SConstruct b/bsp/stm32/stm32f103-dofly-M3S/SConstruct index 541fddf58a2..af8d39d821a 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/SConstruct +++ b/bsp/stm32/stm32f103-dofly-M3S/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 rtthread.map') diff --git a/bsp/stm32/stm32f103-dofly-M3S/board/SConscript b/bsp/stm32/stm32f103-dofly-M3S/board/SConscript index dcfb75afb2b..dffd9fb8ea7 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/board/SConscript +++ b/bsp/stm32/stm32f103-dofly-M3S/board/SConscript @@ -27,11 +27,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-dofly-M3S/rtconfig.py b/bsp/stm32/stm32f103-dofly-M3S/rtconfig.py index 63bacb9e6f5..61ba95699e2 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/rtconfig.py +++ b/bsp/stm32/stm32f103-dofly-M3S/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-dofly-lyc8/SConstruct b/bsp/stm32/stm32f103-dofly-lyc8/SConstruct index 2a46bcc92c3..0b03791ed09 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/SConstruct +++ b/bsp/stm32/stm32f103-dofly-lyc8/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 = ['$LINK $SOURCES $LINKFLAGS -o $TARGET --map rt-thread.map']) diff --git a/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript b/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript index e3f18433605..ed630f8b21f 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript +++ b/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] 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-dofly-lyc8/rtconfig.py b/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.py index cf313add088..b90f7e65a9d 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.py +++ b/bsp/stm32/stm32f103-dofly-lyc8/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-fire-arbitrary/SConstruct b/bsp/stm32/stm32f103-fire-arbitrary/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/SConstruct +++ b/bsp/stm32/stm32f103-fire-arbitrary/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-fire-arbitrary/board/SConscript b/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript index 42f51083a0e..f5e3fba8b0f 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript @@ -27,11 +27,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'] CPPDEFINES = ['STM32F103xE'] diff --git a/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.py b/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.py index cf313add088..b90f7e65a9d 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.py +++ b/bsp/stm32/stm32f103-fire-arbitrary/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct b/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/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-gizwits-gokitv21/board/SConscript b/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript index e3f18433605..ed630f8b21f 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] 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-gizwits-gokitv21/rtconfig.py b/bsp/stm32/stm32f103-gizwits-gokitv21/rtconfig.py index 437e6becf65..558924a36a3 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/rtconfig.py +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-hw100k-ibox/SConstruct b/bsp/stm32/stm32f103-hw100k-ibox/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/SConstruct +++ b/bsp/stm32/stm32f103-hw100k-ibox/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-hw100k-ibox/board/SConscript b/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript index 12d5420d44e..490cea816a5 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript +++ b/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript @@ -25,11 +25,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-hw100k-ibox/rtconfig.py b/bsp/stm32/stm32f103-hw100k-ibox/rtconfig.py index 437e6becf65..558924a36a3 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/rtconfig.py +++ b/bsp/stm32/stm32f103-hw100k-ibox/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-onenet-nbiot/SConstruct b/bsp/stm32/stm32f103-onenet-nbiot/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/SConstruct +++ b/bsp/stm32/stm32f103-onenet-nbiot/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-onenet-nbiot/board/SConscript b/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript index df4c27c2910..9ae5bf07fe5 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript +++ b/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript @@ -20,11 +20,11 @@ path += [cwd + '/CubeMX_Config/Inc'] 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'] CPPDEFINES = ['STM32F103xE'] diff --git a/bsp/stm32/stm32f103-onenet-nbiot/rtconfig.py b/bsp/stm32/stm32f103-onenet-nbiot/rtconfig.py index a6d89ffdfdc..03db7f38261 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/rtconfig.py +++ b/bsp/stm32/stm32f103-onenet-nbiot/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f103-yf-ufun/SConstruct b/bsp/stm32/stm32f103-yf-ufun/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/stm32f103-yf-ufun/SConstruct +++ b/bsp/stm32/stm32f103-yf-ufun/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-yf-ufun/board/SConscript b/bsp/stm32/stm32f103-yf-ufun/board/SConscript index 6bf641022e6..2610c2e3abb 100644 --- a/bsp/stm32/stm32f103-yf-ufun/board/SConscript +++ b/bsp/stm32/stm32f103-yf-ufun/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] 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-yf-ufun/rtconfig.py b/bsp/stm32/stm32f103-yf-ufun/rtconfig.py index 437e6becf65..558924a36a3 100644 --- a/bsp/stm32/stm32f103-yf-ufun/rtconfig.py +++ b/bsp/stm32/stm32f103-yf-ufun/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f107-uc-eval/SConstruct b/bsp/stm32/stm32f107-uc-eval/SConstruct index e636260b5a2..870efaf7081 100644 --- a/bsp/stm32/stm32f107-uc-eval/SConstruct +++ b/bsp/stm32/stm32f107-uc-eval/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/stm32f107-uc-eval/board/SConscript b/bsp/stm32/stm32f107-uc-eval/board/SConscript index b2eb3d2681b..2caf5e4c6b6 100644 --- a/bsp/stm32/stm32f107-uc-eval/board/SConscript +++ b/bsp/stm32/stm32f107-uc-eval/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] 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_stm32f107xc.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F1xx_HAL/CMSIS/Device/ST/STM32F1xx/Source/Templates/arm/startup_stm32f107xc.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_stm32f107xc.s'] # STM32F100xB || STM32F100xE || STM32F101x6 diff --git a/bsp/stm32/stm32f107-uc-eval/rtconfig.py b/bsp/stm32/stm32f107-uc-eval/rtconfig.py index cf313add088..b90f7e65a9d 100644 --- a/bsp/stm32/stm32f107-uc-eval/rtconfig.py +++ b/bsp/stm32/stm32f107-uc-eval/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f207-st-nucleo/SConstruct b/bsp/stm32/stm32f207-st-nucleo/SConstruct index 3b4403a7e45..45ad323e44b 100644 --- a/bsp/stm32/stm32f207-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f207-st-nucleo/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/stm32f207-st-nucleo/board/SConscript b/bsp/stm32/stm32f207-st-nucleo/board/SConscript index 6e2bd14e56d..641a6d27496 100644 --- a/bsp/stm32/stm32f207-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f207-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Core/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f207xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/arm/startup_stm32f207xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F2xx_HAL/CMSIS/Device/ST/STM32F2xx/Source/Templates/iar/startup_stm32f207xx.s'] # STM32F205xx || STM32F207xx || STM32F215xx diff --git a/bsp/stm32/stm32f207-st-nucleo/rtconfig.py b/bsp/stm32/stm32f207-st-nucleo/rtconfig.py index a7a2b3a0649..3e047b559c8 100644 --- a/bsp/stm32/stm32f207-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f207-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f302-st-nucleo/SConstruct b/bsp/stm32/stm32f302-st-nucleo/SConstruct index dfef5be14f2..18426367fca 100644 --- a/bsp/stm32/stm32f302-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f302-st-nucleo/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/stm32f302-st-nucleo/board/SConscript b/bsp/stm32/stm32f302-st-nucleo/board/SConscript index cbbf9b91dee..9fe15f49639 100644 --- a/bsp/stm32/stm32f302-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f302-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/gcc/startup_stm32f302x8.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/arm/startup_stm32f302x8.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F3xx_HAL/CMSIS/Device/ST/STM32F3xx/Source/Templates/iar/startup_stm32f302x8.s'] # (STM32F301x8) || (STM32F302x8) || (STM32F318xx) diff --git a/bsp/stm32/stm32f302-st-nucleo/rtconfig.py b/bsp/stm32/stm32f302-st-nucleo/rtconfig.py index c1d6bcf8694..9d514aa1a82 100644 --- a/bsp/stm32/stm32f302-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f302-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f401-st-nucleo/SConstruct b/bsp/stm32/stm32f401-st-nucleo/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f401-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f401-st-nucleo/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/stm32f401-st-nucleo/board/SConscript b/bsp/stm32/stm32f401-st-nucleo/board/SConscript index b618109be64..cc99fd07742 100644 --- a/bsp/stm32/stm32f401-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f401-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f401xe.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f401xe.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f401xe.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f401-st-nucleo/rtconfig.py b/bsp/stm32/stm32f401-st-nucleo/rtconfig.py index 0b5598eb908..cc91404e872 100644 --- a/bsp/stm32/stm32f401-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f401-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/SConstruct b/bsp/stm32/stm32f405-smdz-breadfruit/SConstruct index 761a4751f27..e77a63ac803 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/SConstruct +++ b/bsp/stm32/stm32f405-smdz-breadfruit/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 rtthread.map') diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript b/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript index 8cf2e2973ef..268558f15f9 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript +++ b/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f405xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f405xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f405xx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f405-smdz-breadfruit/rtconfig.py b/bsp/stm32/stm32f405-smdz-breadfruit/rtconfig.py index 31f774d11fa..1027da3a963 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/rtconfig.py +++ b/bsp/stm32/stm32f405-smdz-breadfruit/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f407-armfly-v5/SConstruct b/bsp/stm32/stm32f407-armfly-v5/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f407-armfly-v5/SConstruct +++ b/bsp/stm32/stm32f407-armfly-v5/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/stm32f407-armfly-v5/board/SConscript b/bsp/stm32/stm32f407-armfly-v5/board/SConscript index 561234a47a1..a33d67953db 100644 --- a/bsp/stm32/stm32f407-armfly-v5/board/SConscript +++ b/bsp/stm32/stm32f407-armfly-v5/board/SConscript @@ -24,11 +24,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f407-armfly-v5/rtconfig.py b/bsp/stm32/stm32f407-armfly-v5/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/stm32f407-armfly-v5/rtconfig.py +++ b/bsp/stm32/stm32f407-armfly-v5/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f407-atk-explorer/SConstruct b/bsp/stm32/stm32f407-atk-explorer/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f407-atk-explorer/SConstruct +++ b/bsp/stm32/stm32f407-atk-explorer/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/stm32f407-atk-explorer/board/SConscript b/bsp/stm32/stm32f407-atk-explorer/board/SConscript index 03bf0e6802f..78b961dc11e 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/SConscript +++ b/bsp/stm32/stm32f407-atk-explorer/board/SConscript @@ -38,11 +38,11 @@ if GetDepend(['BSP_USING_TOUCH']): startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] CPPDEFINES = ['STM32F407xx'] diff --git a/bsp/stm32/stm32f407-atk-explorer/rtconfig.py b/bsp/stm32/stm32f407-atk-explorer/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/stm32f407-atk-explorer/rtconfig.py +++ b/bsp/stm32/stm32f407-atk-explorer/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f407-robomaster-c/SConstruct b/bsp/stm32/stm32f407-robomaster-c/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f407-robomaster-c/SConstruct +++ b/bsp/stm32/stm32f407-robomaster-c/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/stm32f407-robomaster-c/board/SConscript b/bsp/stm32/stm32f407-robomaster-c/board/SConscript index fd34090efc5..011f03ed862 100644 --- a/bsp/stm32/stm32f407-robomaster-c/board/SConscript +++ b/bsp/stm32/stm32f407-robomaster-c/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f407-robomaster-c/rtconfig.py b/bsp/stm32/stm32f407-robomaster-c/rtconfig.py index fcf565ed403..fa38f4e52b2 100644 --- a/bsp/stm32/stm32f407-robomaster-c/rtconfig.py +++ b/bsp/stm32/stm32f407-robomaster-c/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -126,7 +126,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f407-st-discovery/SConstruct b/bsp/stm32/stm32f407-st-discovery/SConstruct index a021b1b3e31..a1d21c0e34b 100644 --- a/bsp/stm32/stm32f407-st-discovery/SConstruct +++ b/bsp/stm32/stm32f407-st-discovery/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 rtthread.map') diff --git a/bsp/stm32/stm32f407-st-discovery/board/SConscript b/bsp/stm32/stm32f407-st-discovery/board/SConscript index 8fd552cdadc..5efef658947 100644 --- a/bsp/stm32/stm32f407-st-discovery/board/SConscript +++ b/bsp/stm32/stm32f407-st-discovery/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f407xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f407xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f407xx.s'] CPPDEFINES = ['STM32F407xx'] diff --git a/bsp/stm32/stm32f407-st-discovery/rtconfig.py b/bsp/stm32/stm32f407-st-discovery/rtconfig.py index b4605791cb2..d2446f9fde5 100644 --- a/bsp/stm32/stm32f407-st-discovery/rtconfig.py +++ b/bsp/stm32/stm32f407-st-discovery/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f410-st-nucleo/SConstruct b/bsp/stm32/stm32f410-st-nucleo/SConstruct index a021b1b3e31..a1d21c0e34b 100644 --- a/bsp/stm32/stm32f410-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f410-st-nucleo/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 rtthread.map') diff --git a/bsp/stm32/stm32f410-st-nucleo/board/SConscript b/bsp/stm32/stm32f410-st-nucleo/board/SConscript index 5eb2eff4bcb..b48c7ccd5f7 100644 --- a/bsp/stm32/stm32f410-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f410-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f410rx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f410rx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f410rx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f410-st-nucleo/rtconfig.py b/bsp/stm32/stm32f410-st-nucleo/rtconfig.py index 51934c8fa9f..c3765e6f08c 100644 --- a/bsp/stm32/stm32f410-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f410-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f411-atk-nano/SConstruct b/bsp/stm32/stm32f411-atk-nano/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f411-atk-nano/SConstruct +++ b/bsp/stm32/stm32f411-atk-nano/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/stm32f411-atk-nano/board/SConscript b/bsp/stm32/stm32f411-atk-nano/board/SConscript index 3669458f0de..ee064b44e11 100644 --- a/bsp/stm32/stm32f411-atk-nano/board/SConscript +++ b/bsp/stm32/stm32f411-atk-nano/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 + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f411-atk-nano/rtconfig.py b/bsp/stm32/stm32f411-atk-nano/rtconfig.py index 403fd8226d3..f92cd4c85ff 100644 --- a/bsp/stm32/stm32f411-atk-nano/rtconfig.py +++ b/bsp/stm32/stm32f411-atk-nano/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f411-st-nucleo/SConstruct b/bsp/stm32/stm32f411-st-nucleo/SConstruct index a021b1b3e31..a1d21c0e34b 100644 --- a/bsp/stm32/stm32f411-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f411-st-nucleo/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 rtthread.map') diff --git a/bsp/stm32/stm32f411-st-nucleo/board/SConscript b/bsp/stm32/stm32f411-st-nucleo/board/SConscript index d79c31fd8d4..5e116aa4261 100644 --- a/bsp/stm32/stm32f411-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f411-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f411-st-nucleo/rtconfig.py b/bsp/stm32/stm32f411-st-nucleo/rtconfig.py index 5697fba90df..78b61b7d2fb 100644 --- a/bsp/stm32/stm32f411-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f411-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f411-weact-MiniF4/SConstruct b/bsp/stm32/stm32f411-weact-MiniF4/SConstruct index a021b1b3e31..a1d21c0e34b 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/SConstruct +++ b/bsp/stm32/stm32f411-weact-MiniF4/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 rtthread.map') diff --git a/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript b/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript index b9c207959e1..df234f11527 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript +++ b/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f411xe.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f411xe.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f411xe.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.py b/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.py index 51934c8fa9f..c3765e6f08c 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.py +++ b/bsp/stm32/stm32f411-weact-MiniF4/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f412-st-nucleo/SConstruct b/bsp/stm32/stm32f412-st-nucleo/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f412-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f412-st-nucleo/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/stm32f412-st-nucleo/board/SConscript b/bsp/stm32/stm32f412-st-nucleo/board/SConscript index 75a677d35aa..9c38059432e 100644 --- a/bsp/stm32/stm32f412-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f412-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f412zx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f412zx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f412zx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f412-st-nucleo/rtconfig.py b/bsp/stm32/stm32f412-st-nucleo/rtconfig.py index 9193d4a1d57..82445d4c2e4 100644 --- a/bsp/stm32/stm32f412-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f412-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f413-st-nucleo/SConstruct b/bsp/stm32/stm32f413-st-nucleo/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f413-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f413-st-nucleo/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/stm32f413-st-nucleo/board/SConscript b/bsp/stm32/stm32f413-st-nucleo/board/SConscript index 5c964e020e7..61f69cbd131 100644 --- a/bsp/stm32/stm32f413-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f413-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f413xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f413xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f413xx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f413-st-nucleo/rtconfig.py b/bsp/stm32/stm32f413-st-nucleo/rtconfig.py index 403fd8226d3..f92cd4c85ff 100644 --- a/bsp/stm32/stm32f413-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f413-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f427-robomaster-a/SConstruct b/bsp/stm32/stm32f427-robomaster-a/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f427-robomaster-a/SConstruct +++ b/bsp/stm32/stm32f427-robomaster-a/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/stm32f427-robomaster-a/board/SConscript b/bsp/stm32/stm32f427-robomaster-a/board/SConscript index 7443021c5e9..c4fccb1494c 100644 --- a/bsp/stm32/stm32f427-robomaster-a/board/SConscript +++ b/bsp/stm32/stm32f427-robomaster-a/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 + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f427xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f427xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f427xx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f427-robomaster-a/rtconfig.py b/bsp/stm32/stm32f427-robomaster-a/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/stm32f427-robomaster-a/rtconfig.py +++ b/bsp/stm32/stm32f427-robomaster-a/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f429-armfly-v6/SConstruct b/bsp/stm32/stm32f429-armfly-v6/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f429-armfly-v6/SConstruct +++ b/bsp/stm32/stm32f429-armfly-v6/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/stm32f429-armfly-v6/board/SConscript b/bsp/stm32/stm32f429-armfly-v6/board/SConscript index 7ccc2fb166a..d8c4ccafabe 100644 --- a/bsp/stm32/stm32f429-armfly-v6/board/SConscript +++ b/bsp/stm32/stm32f429-armfly-v6/board/SConscript @@ -30,11 +30,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s'] CPPDEFINES = ['STM32F429xx'] diff --git a/bsp/stm32/stm32f429-armfly-v6/rtconfig.py b/bsp/stm32/stm32f429-armfly-v6/rtconfig.py index 0a92515db29..df5ad74299c 100644 --- a/bsp/stm32/stm32f429-armfly-v6/rtconfig.py +++ b/bsp/stm32/stm32f429-armfly-v6/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f429-atk-apollo/SConstruct b/bsp/stm32/stm32f429-atk-apollo/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f429-atk-apollo/SConstruct +++ b/bsp/stm32/stm32f429-atk-apollo/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/stm32f429-atk-apollo/board/SConscript b/bsp/stm32/stm32f429-atk-apollo/board/SConscript index 67f7b855351..7e12660bd7d 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32f429-atk-apollo/board/SConscript @@ -37,11 +37,11 @@ if GetDepend(['BSP_USING_AUDIO']): startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s'] CPPDEFINES = ['STM32F429xx'] diff --git a/bsp/stm32/stm32f429-atk-apollo/rtconfig.py b/bsp/stm32/stm32f429-atk-apollo/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/stm32f429-atk-apollo/rtconfig.py +++ b/bsp/stm32/stm32f429-atk-apollo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f429-fire-challenger/SConstruct b/bsp/stm32/stm32f429-fire-challenger/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f429-fire-challenger/SConstruct +++ b/bsp/stm32/stm32f429-fire-challenger/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/stm32f429-fire-challenger/board/SConscript b/bsp/stm32/stm32f429-fire-challenger/board/SConscript index cac1d90e576..a0b697822c3 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/SConscript +++ b/bsp/stm32/stm32f429-fire-challenger/board/SConscript @@ -27,11 +27,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s'] CPPDEFINES = ['STM32F429xx'] diff --git a/bsp/stm32/stm32f429-fire-challenger/rtconfig.py b/bsp/stm32/stm32f429-fire-challenger/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/stm32f429-fire-challenger/rtconfig.py +++ b/bsp/stm32/stm32f429-fire-challenger/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f429-st-disco/SConstruct b/bsp/stm32/stm32f429-st-disco/SConstruct index a021b1b3e31..a1d21c0e34b 100644 --- a/bsp/stm32/stm32f429-st-disco/SConstruct +++ b/bsp/stm32/stm32f429-st-disco/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 rtthread.map') diff --git a/bsp/stm32/stm32f429-st-disco/board/SConscript b/bsp/stm32/stm32f429-st-disco/board/SConscript index a6bf311a2bc..a3218f69434 100644 --- a/bsp/stm32/stm32f429-st-disco/board/SConscript +++ b/bsp/stm32/stm32f429-st-disco/board/SConscript @@ -36,11 +36,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f429xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f429xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f429xx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f429-st-disco/rtconfig.py b/bsp/stm32/stm32f429-st-disco/rtconfig.py index b4605791cb2..d2446f9fde5 100644 --- a/bsp/stm32/stm32f429-st-disco/rtconfig.py +++ b/bsp/stm32/stm32f429-st-disco/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f446-st-nucleo/SConstruct b/bsp/stm32/stm32f446-st-nucleo/SConstruct index fe44ee0b8a7..cf42db1d75c 100644 --- a/bsp/stm32/stm32f446-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f446-st-nucleo/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/stm32f446-st-nucleo/board/SConscript b/bsp/stm32/stm32f446-st-nucleo/board/SConscript index ce689b5e68b..2f0551a3798 100644 --- a/bsp/stm32/stm32f446-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f446-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f446xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f446xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f446xx.s'] CPPDEFINES = ['STM32F446xx'] diff --git a/bsp/stm32/stm32f446-st-nucleo/rtconfig.py b/bsp/stm32/stm32f446-st-nucleo/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/stm32f446-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f446-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f469-st-disco/SConstruct b/bsp/stm32/stm32f469-st-disco/SConstruct index f401eae23bb..432cff21f44 100644 --- a/bsp/stm32/stm32f469-st-disco/SConstruct +++ b/bsp/stm32/stm32f469-st-disco/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 rtthread.map') diff --git a/bsp/stm32/stm32f469-st-disco/board/SConscript b/bsp/stm32/stm32f469-st-disco/board/SConscript index 03683a73e12..194948e3c3a 100644 --- a/bsp/stm32/stm32f469-st-disco/board/SConscript +++ b/bsp/stm32/stm32f469-st-disco/board/SConscript @@ -30,11 +30,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/gcc/startup_stm32f469xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/arm/startup_stm32f469xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F4xx_HAL/CMSIS/Device/ST/STM32F4xx/Source/Templates/iar/startup_stm32f469xx.s'] # STM32F405xx) || STM32F415xx) || STM32F407xx) || STM32F417xx) diff --git a/bsp/stm32/stm32f469-st-disco/rtconfig.py b/bsp/stm32/stm32f469-st-disco/rtconfig.py index b4605791cb2..d2446f9fde5 100644 --- a/bsp/stm32/stm32f469-st-disco/rtconfig.py +++ b/bsp/stm32/stm32f469-st-disco/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f746-st-disco/SConstruct b/bsp/stm32/stm32f746-st-disco/SConstruct index 1e20ca63a7b..ada3672e5fb 100644 --- a/bsp/stm32/stm32f746-st-disco/SConstruct +++ b/bsp/stm32/stm32f746-st-disco/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/stm32f746-st-disco/board/SConscript b/bsp/stm32/stm32f746-st-disco/board/SConscript index f917aa4c8b0..3173f33d8d2 100644 --- a/bsp/stm32/stm32f746-st-disco/board/SConscript +++ b/bsp/stm32/stm32f746-st-disco/board/SConscript @@ -24,11 +24,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f746xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f746xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f746xx.s'] # STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || diff --git a/bsp/stm32/stm32f746-st-disco/rtconfig.py b/bsp/stm32/stm32f746-st-disco/rtconfig.py index 043f8a70118..d4e7017d0c2 100644 --- a/bsp/stm32/stm32f746-st-disco/rtconfig.py +++ b/bsp/stm32/stm32f746-st-disco/rtconfig.py @@ -19,8 +19,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -131,7 +131,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f746-st-nucleo/SConstruct b/bsp/stm32/stm32f746-st-nucleo/SConstruct index 1e20ca63a7b..ada3672e5fb 100644 --- a/bsp/stm32/stm32f746-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f746-st-nucleo/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/stm32f746-st-nucleo/board/SConscript b/bsp/stm32/stm32f746-st-nucleo/board/SConscript index 64027e46518..a6affa9b902 100644 --- a/bsp/stm32/stm32f746-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f746-st-nucleo/board/SConscript @@ -19,11 +19,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f746xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f746xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f746xx.s'] # STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || diff --git a/bsp/stm32/stm32f746-st-nucleo/rtconfig.py b/bsp/stm32/stm32f746-st-nucleo/rtconfig.py index fd511bc3f69..f2e40ba502e 100644 --- a/bsp/stm32/stm32f746-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f746-st-nucleo/rtconfig.py @@ -19,8 +19,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -133,7 +133,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f767-atk-apollo/SConstruct b/bsp/stm32/stm32f767-atk-apollo/SConstruct index 1e20ca63a7b..ada3672e5fb 100644 --- a/bsp/stm32/stm32f767-atk-apollo/SConstruct +++ b/bsp/stm32/stm32f767-atk-apollo/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/stm32f767-atk-apollo/board/SConscript b/bsp/stm32/stm32f767-atk-apollo/board/SConscript index 6260edad146..58644df0dd9 100644 --- a/bsp/stm32/stm32f767-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32f767-atk-apollo/board/SConscript @@ -27,11 +27,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] CPPDEFINES = ['STM32F767xx'] diff --git a/bsp/stm32/stm32f767-atk-apollo/rtconfig.py b/bsp/stm32/stm32f767-atk-apollo/rtconfig.py index 1a1457d734b..663c053f39d 100644 --- a/bsp/stm32/stm32f767-atk-apollo/rtconfig.py +++ b/bsp/stm32/stm32f767-atk-apollo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct b/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct index 1e20ca63a7b..ada3672e5fb 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct +++ b/bsp/stm32/stm32f767-fire-challenger-v1/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/stm32f767-fire-challenger-v1/board/SConscript b/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript index 6260edad146..58644df0dd9 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript +++ b/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript @@ -27,11 +27,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] CPPDEFINES = ['STM32F767xx'] diff --git a/bsp/stm32/stm32f767-fire-challenger-v1/rtconfig.py b/bsp/stm32/stm32f767-fire-challenger-v1/rtconfig.py index 8567ba63d87..ea1f99f4cb4 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/rtconfig.py +++ b/bsp/stm32/stm32f767-fire-challenger-v1/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f767-st-nucleo/SConstruct b/bsp/stm32/stm32f767-st-nucleo/SConstruct index 1e20ca63a7b..ada3672e5fb 100644 --- a/bsp/stm32/stm32f767-st-nucleo/SConstruct +++ b/bsp/stm32/stm32f767-st-nucleo/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/stm32f767-st-nucleo/board/SConscript b/bsp/stm32/stm32f767-st-nucleo/board/SConscript index affb7c880ba..65fee2dbb22 100644 --- a/bsp/stm32/stm32f767-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f767-st-nucleo/board/SConscript @@ -19,11 +19,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] # STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || diff --git a/bsp/stm32/stm32f767-st-nucleo/rtconfig.py b/bsp/stm32/stm32f767-st-nucleo/rtconfig.py index e91236214fa..96fc970dc42 100644 --- a/bsp/stm32/stm32f767-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32f767-st-nucleo/rtconfig.py @@ -19,8 +19,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -133,7 +133,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32f769-st-disco/SConstruct b/bsp/stm32/stm32f769-st-disco/SConstruct index 1e20ca63a7b..ada3672e5fb 100644 --- a/bsp/stm32/stm32f769-st-disco/SConstruct +++ b/bsp/stm32/stm32f769-st-disco/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/stm32f769-st-disco/board/SConscript b/bsp/stm32/stm32f769-st-disco/board/SConscript index 416150abae1..3266673645f 100644 --- a/bsp/stm32/stm32f769-st-disco/board/SConscript +++ b/bsp/stm32/stm32f769-st-disco/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/gcc/startup_stm32f767xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/arm/startup_stm32f767xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32F7xx_HAL/CMSIS/Device/ST/STM32F7xx/Source/Templates/iar/startup_stm32f767xx.s'] # STM32F756xx || STM32F746xx || STM32F745xx || STM32F767xx || diff --git a/bsp/stm32/stm32f769-st-disco/rtconfig.py b/bsp/stm32/stm32f769-st-disco/rtconfig.py index 9bdf9406055..65a3b8e2a59 100644 --- a/bsp/stm32/stm32f769-st-disco/rtconfig.py +++ b/bsp/stm32/stm32f769-st-disco/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -126,7 +126,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32g070-st-nucleo/SConstruct b/bsp/stm32/stm32g070-st-nucleo/SConstruct index a52778f267c..8d358b6e41f 100644 --- a/bsp/stm32/stm32g070-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g070-st-nucleo/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/stm32g070-st-nucleo/board/SConscript b/bsp/stm32/stm32g070-st-nucleo/board/SConscript index acbd7e22f9e..b04739f7092 100644 --- a/bsp/stm32/stm32g070-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g070-st-nucleo/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/gcc/startup_stm32g070xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/arm/startup_stm32g070xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/iar/startup_stm32g070xx.s'] CPPDEFINES = ['STM32G070xx'] diff --git a/bsp/stm32/stm32g070-st-nucleo/rtconfig.py b/bsp/stm32/stm32g070-st-nucleo/rtconfig.py index 95477c738c0..afd5f66e4a3 100644 --- a/bsp/stm32/stm32g070-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32g070-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32g071-st-nucleo/SConstruct b/bsp/stm32/stm32g071-st-nucleo/SConstruct index a52778f267c..8d358b6e41f 100644 --- a/bsp/stm32/stm32g071-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g071-st-nucleo/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/stm32g071-st-nucleo/board/SConscript b/bsp/stm32/stm32g071-st-nucleo/board/SConscript index cbf0d13e662..0eefb11b2be 100644 --- a/bsp/stm32/stm32g071-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g071-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/gcc/startup_stm32g071xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/arm/startup_stm32g071xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G0xx_HAL/CMSIS/Device/ST/STM32G0xx/Source/Templates/iar/startup_stm32g071xx.s'] CPPDEFINES = ['STM32G071xx'] diff --git a/bsp/stm32/stm32g071-st-nucleo/rtconfig.py b/bsp/stm32/stm32g071-st-nucleo/rtconfig.py index 95477c738c0..afd5f66e4a3 100644 --- a/bsp/stm32/stm32g071-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32g071-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32g431-st-nucleo/SConstruct b/bsp/stm32/stm32g431-st-nucleo/SConstruct index eea15e28283..b793ea3dd00 100644 --- a/bsp/stm32/stm32g431-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g431-st-nucleo/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/stm32g431-st-nucleo/board/SConscript b/bsp/stm32/stm32g431-st-nucleo/board/SConscript index bd65916cdb7..0276408f8b6 100644 --- a/bsp/stm32/stm32g431-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g431-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g431xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/arm/startup_stm32g431xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/iar/startup_stm32g431xx.s'] CPPDEFINES = ['STM32G431xx'] diff --git a/bsp/stm32/stm32g431-st-nucleo/rtconfig.py b/bsp/stm32/stm32g431-st-nucleo/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/stm32g431-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32g431-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32g474-st-nucleo/SConstruct b/bsp/stm32/stm32g474-st-nucleo/SConstruct index eea15e28283..b793ea3dd00 100644 --- a/bsp/stm32/stm32g474-st-nucleo/SConstruct +++ b/bsp/stm32/stm32g474-st-nucleo/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/stm32g474-st-nucleo/board/SConscript b/bsp/stm32/stm32g474-st-nucleo/board/SConscript index 95ed6291918..349e1397ab0 100644 --- a/bsp/stm32/stm32g474-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g474-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/gcc/startup_stm32g474xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/arm/startup_stm32g474xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32G4xx_HAL/CMSIS/Device/ST/STM32G4xx/Source/Templates/iar/startup_stm32g474xx.s'] CPPDEFINES = ['STM32G474xx'] diff --git a/bsp/stm32/stm32g474-st-nucleo/rtconfig.py b/bsp/stm32/stm32g474-st-nucleo/rtconfig.py index 871c33548cf..5e5bc020645 100644 --- a/bsp/stm32/stm32g474-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32g474-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32h743-armfly-v7/SConstruct b/bsp/stm32/stm32h743-armfly-v7/SConstruct index fc6658ebc70..02c0e78cd2d 100644 --- a/bsp/stm32/stm32h743-armfly-v7/SConstruct +++ b/bsp/stm32/stm32h743-armfly-v7/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/stm32h743-armfly-v7/board/SConscript b/bsp/stm32/stm32h743-armfly-v7/board/SConscript index ab03805d74e..2ed225df9de 100644 --- a/bsp/stm32/stm32h743-armfly-v7/board/SConscript +++ b/bsp/stm32/stm32h743-armfly-v7/board/SConscript @@ -14,11 +14,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] # STM32H743xx || STM32H750xx || STM32F753xx diff --git a/bsp/stm32/stm32h743-armfly-v7/rtconfig.py b/bsp/stm32/stm32h743-armfly-v7/rtconfig.py index 13a0ebbdb9a..15ddd3158a0 100644 --- a/bsp/stm32/stm32h743-armfly-v7/rtconfig.py +++ b/bsp/stm32/stm32h743-armfly-v7/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32h743-atk-apollo/SConstruct b/bsp/stm32/stm32h743-atk-apollo/SConstruct index 7adb1878ab1..3627dcfe831 100644 --- a/bsp/stm32/stm32h743-atk-apollo/SConstruct +++ b/bsp/stm32/stm32h743-atk-apollo/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/stm32h743-atk-apollo/board/SConscript b/bsp/stm32/stm32h743-atk-apollo/board/SConscript index 5a278d4f849..53187099b70 100644 --- a/bsp/stm32/stm32h743-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32h743-atk-apollo/board/SConscript @@ -28,11 +28,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] # STM32H743xx || STM32H750xx || STM32F753xx diff --git a/bsp/stm32/stm32h743-atk-apollo/rtconfig.py b/bsp/stm32/stm32h743-atk-apollo/rtconfig.py index 13a0ebbdb9a..15ddd3158a0 100644 --- a/bsp/stm32/stm32h743-atk-apollo/rtconfig.py +++ b/bsp/stm32/stm32h743-atk-apollo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32h743-openmv-h7plus/SConstruct b/bsp/stm32/stm32h743-openmv-h7plus/SConstruct index 7adb1878ab1..3627dcfe831 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/SConstruct +++ b/bsp/stm32/stm32h743-openmv-h7plus/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/stm32h743-openmv-h7plus/board/SConscript b/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript index 5269d23d87f..643c25cf878 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript +++ b/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript @@ -26,11 +26,11 @@ if GetDepend(['BSP_USING_OV5640']): if GetDepend(['BSP_USING_DCMI']): src += ['ports/drv_dcmi.c'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] CPPDEFINES = ['STM32H743xx'] diff --git a/bsp/stm32/stm32h743-openmv-h7plus/rtconfig.py b/bsp/stm32/stm32h743-openmv-h7plus/rtconfig.py index 9193d4a1d57..82445d4c2e4 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/rtconfig.py +++ b/bsp/stm32/stm32h743-openmv-h7plus/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32h743-st-nucleo/SConstruct b/bsp/stm32/stm32h743-st-nucleo/SConstruct index fc6658ebc70..02c0e78cd2d 100644 --- a/bsp/stm32/stm32h743-st-nucleo/SConstruct +++ b/bsp/stm32/stm32h743-st-nucleo/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/stm32h743-st-nucleo/board/SConscript b/bsp/stm32/stm32h743-st-nucleo/board/SConscript index ab03805d74e..2ed225df9de 100644 --- a/bsp/stm32/stm32h743-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32h743-st-nucleo/board/SConscript @@ -14,11 +14,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h743xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h743xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h743xx.s'] # STM32H743xx || STM32H750xx || STM32F753xx diff --git a/bsp/stm32/stm32h743-st-nucleo/rtconfig.py b/bsp/stm32/stm32h743-st-nucleo/rtconfig.py index 13a0ebbdb9a..15ddd3158a0 100644 --- a/bsp/stm32/stm32h743-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32h743-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32h747-st-discovery/SConstruct b/bsp/stm32/stm32h747-st-discovery/SConstruct index fc6658ebc70..02c0e78cd2d 100644 --- a/bsp/stm32/stm32h747-st-discovery/SConstruct +++ b/bsp/stm32/stm32h747-st-discovery/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/stm32h747-st-discovery/board/SConscript b/bsp/stm32/stm32h747-st-discovery/board/SConscript index fa379359d2b..41968a76f55 100644 --- a/bsp/stm32/stm32h747-st-discovery/board/SConscript +++ b/bsp/stm32/stm32h747-st-discovery/board/SConscript @@ -14,11 +14,11 @@ path += [cwd + '/CubeMX_Config/CM7/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h747xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h747xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h747xx.s'] # STM32H743xx || STM32H750xx || STM32F753xx diff --git a/bsp/stm32/stm32h747-st-discovery/rtconfig.py b/bsp/stm32/stm32h747-st-discovery/rtconfig.py index 13a0ebbdb9a..15ddd3158a0 100644 --- a/bsp/stm32/stm32h747-st-discovery/rtconfig.py +++ b/bsp/stm32/stm32h747-st-discovery/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct b/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct index fc6658ebc70..02c0e78cd2d 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct +++ b/bsp/stm32/stm32h750-armfly-h7-tool/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/stm32h750-armfly-h7-tool/board/SConscript b/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript index 6b21d2e788a..84af31306ee 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript +++ b/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript @@ -16,11 +16,11 @@ if GetDepend('BSP_USING_SPI_LCD'): path = [cwd] path += [cwd + '/CubeMX_Config/Inc'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h750xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h750xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/../../libraries/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h750xx.s'] # STM32H743xx || STM32H750xx || STM32F753xx diff --git a/bsp/stm32/stm32h750-armfly-h7-tool/rtconfig.py b/bsp/stm32/stm32h750-armfly-h7-tool/rtconfig.py index 13a0ebbdb9a..15ddd3158a0 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/rtconfig.py +++ b/bsp/stm32/stm32h750-armfly-h7-tool/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32h750-artpi/SConstruct b/bsp/stm32/stm32h750-artpi/SConstruct index fc6658ebc70..02c0e78cd2d 100644 --- a/bsp/stm32/stm32h750-artpi/SConstruct +++ b/bsp/stm32/stm32h750-artpi/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/stm32h750-artpi/board/SConscript b/bsp/stm32/stm32h750-artpi/board/SConscript index baea8291cc3..cf7062c5f93 100644 --- a/bsp/stm32/stm32h750-artpi/board/SConscript +++ b/bsp/stm32/stm32h750-artpi/board/SConscript @@ -47,11 +47,11 @@ path += [cwd + '/port'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/gcc/startup_stm32h750xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/arm/startup_stm32h750xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32H7xx_HAL/CMSIS/Device/ST/STM32H7xx/Source/Templates/iar/startup_stm32h750xx.s'] # STM32H743xx || STM32H750xx || STM32F753xx diff --git a/bsp/stm32/stm32h750-artpi/board/port/wlan_wiced_lib/SConscript b/bsp/stm32/stm32h750-artpi/board/port/wlan_wiced_lib/SConscript index 54538df77be..4dfd6a5c335 100644 --- a/bsp/stm32/stm32h750-artpi/board/port/wlan_wiced_lib/SConscript +++ b/bsp/stm32/stm32h750-artpi/board/port/wlan_wiced_lib/SConscript @@ -8,7 +8,7 @@ LIBPATH = [] src = [] LIBPATH = [cwd] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: LIBS += ['wifi_6212_armcm7_2.1.2_gcc'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: LIBS += ['libwifi_6212_armcm7_2.1.2_armcc'] diff --git a/bsp/stm32/stm32h750-artpi/rtconfig.py b/bsp/stm32/stm32h750-artpi/rtconfig.py index bf04a43eb90..c1b699a9118 100644 --- a/bsp/stm32/stm32h750-artpi/rtconfig.py +++ b/bsp/stm32/stm32h750-artpi/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l010-st-nucleo/SConstruct b/bsp/stm32/stm32l010-st-nucleo/SConstruct index dd9870f2ca3..60294ba65b6 100644 --- a/bsp/stm32/stm32l010-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l010-st-nucleo/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/stm32l010-st-nucleo/board/SConscript b/bsp/stm32/stm32l010-st-nucleo/board/SConscript index dd7a705f890..20b0528df05 100644 --- a/bsp/stm32/stm32l010-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l010-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/gcc/startup_stm32l053xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/arm/startup_stm32l053xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/iar/startup_stm32l053xx.s'] # STM32L052xx || STM32L053xx || STM32L062xx diff --git a/bsp/stm32/stm32l010-st-nucleo/rtconfig.py b/bsp/stm32/stm32l010-st-nucleo/rtconfig.py index 8eeff0e7beb..b38196abb77 100644 --- a/bsp/stm32/stm32l010-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l010-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l053-st-nucleo/SConstruct b/bsp/stm32/stm32l053-st-nucleo/SConstruct index dd9870f2ca3..60294ba65b6 100644 --- a/bsp/stm32/stm32l053-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l053-st-nucleo/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/stm32l053-st-nucleo/board/SConscript b/bsp/stm32/stm32l053-st-nucleo/board/SConscript index dd7a705f890..20b0528df05 100644 --- a/bsp/stm32/stm32l053-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l053-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/gcc/startup_stm32l053xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/arm/startup_stm32l053xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L0xx_HAL/CMSIS/Device/ST/STM32L0xx/Source/Templates/iar/startup_stm32l053xx.s'] # STM32L052xx || STM32L053xx || STM32L062xx diff --git a/bsp/stm32/stm32l053-st-nucleo/rtconfig.py b/bsp/stm32/stm32l053-st-nucleo/rtconfig.py index 8eeff0e7beb..b38196abb77 100644 --- a/bsp/stm32/stm32l053-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l053-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l412-st-nucleo/SConstruct b/bsp/stm32/stm32l412-st-nucleo/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/stm32l412-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l412-st-nucleo/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/stm32l412-st-nucleo/board/SConscript b/bsp/stm32/stm32l412-st-nucleo/board/SConscript index b64be60ee3c..24533b99fe0 100644 --- a/bsp/stm32/stm32l412-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l412-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l412xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l412xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l412xx.s'] # STM32L412xx || STM32L422xx || STM32L431xx diff --git a/bsp/stm32/stm32l412-st-nucleo/rtconfig.py b/bsp/stm32/stm32l412-st-nucleo/rtconfig.py index d72856616ee..2a680c26b19 100644 --- a/bsp/stm32/stm32l412-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l412-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l431-BearPi/SConstruct b/bsp/stm32/stm32l431-BearPi/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/stm32l431-BearPi/SConstruct +++ b/bsp/stm32/stm32l431-BearPi/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/stm32l431-BearPi/board/SConscript b/bsp/stm32/stm32l431-BearPi/board/SConscript index fd0771718d6..164d890ccaa 100644 --- a/bsp/stm32/stm32l431-BearPi/board/SConscript +++ b/bsp/stm32/stm32l431-BearPi/board/SConscript @@ -20,11 +20,11 @@ path += [cwd + '/CubeMX_Config/Inc'] path += [cwd + '/ports/lcd'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l431xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l431xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l431xx.s'] # STM32L412xx || STM32L422xx || STM32L431xx diff --git a/bsp/stm32/stm32l431-BearPi/rtconfig.py b/bsp/stm32/stm32l431-BearPi/rtconfig.py index a8417a6f218..aa8c165c36b 100644 --- a/bsp/stm32/stm32l431-BearPi/rtconfig.py +++ b/bsp/stm32/stm32l431-BearPi/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l432-st-nucleo/SConstruct b/bsp/stm32/stm32l432-st-nucleo/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/stm32l432-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l432-st-nucleo/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/stm32l432-st-nucleo/board/SConscript b/bsp/stm32/stm32l432-st-nucleo/board/SConscript index 2718c02f3e7..dfd4230195f 100644 --- a/bsp/stm32/stm32l432-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l432-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l432xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l432xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l432xx.s'] # STM32L412xx || STM32L422xx || STM32L431xx diff --git a/bsp/stm32/stm32l432-st-nucleo/rtconfig.py b/bsp/stm32/stm32l432-st-nucleo/rtconfig.py index b6c0783af56..c1f50801663 100644 --- a/bsp/stm32/stm32l432-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l432-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l433-ali-startkit/SConstruct b/bsp/stm32/stm32l433-ali-startkit/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/stm32l433-ali-startkit/SConstruct +++ b/bsp/stm32/stm32l433-ali-startkit/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/stm32l433-ali-startkit/board/SConscript b/bsp/stm32/stm32l433-ali-startkit/board/SConscript index 92859a3b7ce..d25dce93592 100644 --- a/bsp/stm32/stm32l433-ali-startkit/board/SConscript +++ b/bsp/stm32/stm32l433-ali-startkit/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Core/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l433xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l433xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l433xx.s'] CPPDEFINES = ['STM32L433xx'] diff --git a/bsp/stm32/stm32l433-ali-startkit/rtconfig.py b/bsp/stm32/stm32l433-ali-startkit/rtconfig.py index b6c0783af56..c1f50801663 100644 --- a/bsp/stm32/stm32l433-ali-startkit/rtconfig.py +++ b/bsp/stm32/stm32l433-ali-startkit/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l433-st-nucleo/SConstruct b/bsp/stm32/stm32l433-st-nucleo/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/stm32l433-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l433-st-nucleo/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/stm32l433-st-nucleo/board/SConscript b/bsp/stm32/stm32l433-st-nucleo/board/SConscript index a027978bdda..48fff8f9b9f 100644 --- a/bsp/stm32/stm32l433-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l433-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l433xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l433xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l433xx.s'] # STM32L412xx || STM32L422xx || STM32L431xx diff --git a/bsp/stm32/stm32l433-st-nucleo/rtconfig.py b/bsp/stm32/stm32l433-st-nucleo/rtconfig.py index 5ae577cd005..7942919c8e4 100644 --- a/bsp/stm32/stm32l433-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l433-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l452-st-nucleo/SConstruct b/bsp/stm32/stm32l452-st-nucleo/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/stm32l452-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l452-st-nucleo/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/stm32l452-st-nucleo/board/SConscript b/bsp/stm32/stm32l452-st-nucleo/board/SConscript index d35327b32f3..b20e296b633 100644 --- a/bsp/stm32/stm32l452-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l452-st-nucleo/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l452xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l452xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l452xx.s'] # STM32L412xx || STM32L422xx || STM32L431xx diff --git a/bsp/stm32/stm32l452-st-nucleo/rtconfig.py b/bsp/stm32/stm32l452-st-nucleo/rtconfig.py index b6c0783af56..c1f50801663 100644 --- a/bsp/stm32/stm32l452-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l452-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l475-atk-pandora/SConstruct b/bsp/stm32/stm32l475-atk-pandora/SConstruct index dcd7ae28897..4c671485362 100644 --- a/bsp/stm32/stm32l475-atk-pandora/SConstruct +++ b/bsp/stm32/stm32l475-atk-pandora/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/stm32l475-atk-pandora/board/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/SConscript index 085130c434d..76d7ff6a423 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/SConscript @@ -42,11 +42,11 @@ if GetDepend(['BSP_USING_AUDIO']): startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l475xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l475xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l475xx.s'] CPPDEFINES = ['STM32L475xx'] diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript index 3bb10e094d7..3e6b2995f27 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/ports/fal/SConscript @@ -10,7 +10,7 @@ src += Glob('*.c') CPPPATH = [cwd] LOCAL_CFLAGS = '' -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: LOCAL_CFLAGS += ' -std=c99' elif rtconfig.PLATFORM == 'armcc': LOCAL_CFLAGS += ' --c99' diff --git a/bsp/stm32/stm32l475-atk-pandora/rtconfig.py b/bsp/stm32/stm32l475-atk-pandora/rtconfig.py index 4250a3d1529..af29494a89c 100644 --- a/bsp/stm32/stm32l475-atk-pandora/rtconfig.py +++ b/bsp/stm32/stm32l475-atk-pandora/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l475-st-discovery/SConstruct b/bsp/stm32/stm32l475-st-discovery/SConstruct index 6aa0397a60e..8bdea165055 100644 --- a/bsp/stm32/stm32l475-st-discovery/SConstruct +++ b/bsp/stm32/stm32l475-st-discovery/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 rtthread.map') diff --git a/bsp/stm32/stm32l475-st-discovery/board/SConscript b/bsp/stm32/stm32l475-st-discovery/board/SConscript index 1f828dfff48..4b994ba995b 100644 --- a/bsp/stm32/stm32l475-st-discovery/board/SConscript +++ b/bsp/stm32/stm32l475-st-discovery/board/SConscript @@ -23,11 +23,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l475xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l475xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l475xx.s'] diff --git a/bsp/stm32/stm32l475-st-discovery/rtconfig.py b/bsp/stm32/stm32l475-st-discovery/rtconfig.py index 142ba69547b..52c32cec882 100644 --- a/bsp/stm32/stm32l475-st-discovery/rtconfig.py +++ b/bsp/stm32/stm32l475-st-discovery/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l476-st-nucleo/SConstruct b/bsp/stm32/stm32l476-st-nucleo/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/stm32l476-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l476-st-nucleo/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/stm32l476-st-nucleo/board/SConscript b/bsp/stm32/stm32l476-st-nucleo/board/SConscript index 8739a795f82..17970567930 100644 --- a/bsp/stm32/stm32l476-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l476-st-nucleo/board/SConscript @@ -24,11 +24,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l476xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l476xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l476xx.s'] CPPDEFINES = ['STM32L476xx'] diff --git a/bsp/stm32/stm32l476-st-nucleo/rtconfig.py b/bsp/stm32/stm32l476-st-nucleo/rtconfig.py index a0816b29e87..11564b8fd1f 100644 --- a/bsp/stm32/stm32l476-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l476-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l496-ali-developer/SConstruct b/bsp/stm32/stm32l496-ali-developer/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/stm32l496-ali-developer/SConstruct +++ b/bsp/stm32/stm32l496-ali-developer/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/stm32l496-ali-developer/board/SConscript b/bsp/stm32/stm32l496-ali-developer/board/SConscript index fafa1c179ac..19814bd2cc1 100644 --- a/bsp/stm32/stm32l496-ali-developer/board/SConscript +++ b/bsp/stm32/stm32l496-ali-developer/board/SConscript @@ -24,11 +24,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l496xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l496xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l496xx.s'] CPPDEFINES = ['STM32L496xx'] diff --git a/bsp/stm32/stm32l496-ali-developer/rtconfig.py b/bsp/stm32/stm32l496-ali-developer/rtconfig.py index b6c0783af56..c1f50801663 100644 --- a/bsp/stm32/stm32l496-ali-developer/rtconfig.py +++ b/bsp/stm32/stm32l496-ali-developer/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l496-st-nucleo/SConstruct b/bsp/stm32/stm32l496-st-nucleo/SConstruct index 57568a7bdf8..8f7aa79f949 100644 --- a/bsp/stm32/stm32l496-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l496-st-nucleo/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/stm32l496-st-nucleo/board/SConscript b/bsp/stm32/stm32l496-st-nucleo/board/SConscript index b805d48a545..6678edca06c 100644 --- a/bsp/stm32/stm32l496-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l496-st-nucleo/board/SConscript @@ -40,11 +40,11 @@ if GetDepend(['BSP_USING_AUDIO']): startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l496xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l496xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l496xx.s'] CPPDEFINES = ['STM32L496xx'] diff --git a/bsp/stm32/stm32l496-st-nucleo/rtconfig.py b/bsp/stm32/stm32l496-st-nucleo/rtconfig.py index 9193d4a1d57..82445d4c2e4 100644 --- a/bsp/stm32/stm32l496-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l496-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -128,7 +128,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l4r5-st-nucleo/SConstruct b/bsp/stm32/stm32l4r5-st-nucleo/SConstruct index b67bee1d00e..5fe5df200c8 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l4r5-st-nucleo/SConstruct @@ -25,7 +25,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/stm32l4r5-st-nucleo/board/SConscript b/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript index f5db70f0cc5..445c66a446b 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l4r5xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l4r5xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l4r5xx.s'] # STM32L412xx || STM32L422xx || STM32L431xx diff --git a/bsp/stm32/stm32l4r5-st-nucleo/rtconfig.py b/bsp/stm32/stm32l4r5-st-nucleo/rtconfig.py index bbb5b20041e..c388a894059 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l4r5-st-nucleo/rtconfig.py @@ -22,7 +22,7 @@ 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.4' if os.getenv('RTT_EXEC_PATH'): @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l4r9-st-eval/SConstruct b/bsp/stm32/stm32l4r9-st-eval/SConstruct index 6aa0397a60e..8bdea165055 100644 --- a/bsp/stm32/stm32l4r9-st-eval/SConstruct +++ b/bsp/stm32/stm32l4r9-st-eval/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 rtthread.map') diff --git a/bsp/stm32/stm32l4r9-st-eval/board/SConscript b/bsp/stm32/stm32l4r9-st-eval/board/SConscript index c5ca6699b46..fe4923ffdae 100644 --- a/bsp/stm32/stm32l4r9-st-eval/board/SConscript +++ b/bsp/stm32/stm32l4r9-st-eval/board/SConscript @@ -28,11 +28,11 @@ path += [cwd + '/ports/include'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l4r9xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l4r9xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l4r9xx.s'] # STM32L412xx || STM32L422xx || STM32L431xx diff --git a/bsp/stm32/stm32l4r9-st-eval/rtconfig.py b/bsp/stm32/stm32l4r9-st-eval/rtconfig.py index e0f9b603eec..0792efdcea7 100644 --- a/bsp/stm32/stm32l4r9-st-eval/rtconfig.py +++ b/bsp/stm32/stm32l4r9-st-eval/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/SConstruct b/bsp/stm32/stm32l4r9-st-sensortile-box/SConstruct index 6aa0397a60e..8bdea165055 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/SConstruct +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/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 rtthread.map') diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript b/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript index d8b37e8f8ec..969a0c53f1b 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/CubeMX_Config/Core/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/gcc/startup_stm32l4r9xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/arm/startup_stm32l4r9xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L4xx_HAL/CMSIS/Device/ST/STM32L4xx/Source/Templates/iar/startup_stm32l4r9xx.s'] # STM32L412xx || STM32L422xx || STM32L431xx diff --git a/bsp/stm32/stm32l4r9-st-sensortile-box/rtconfig.py b/bsp/stm32/stm32l4r9-st-sensortile-box/rtconfig.py index e0f9b603eec..0792efdcea7 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/rtconfig.py +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32l552-st-nucleo/SConstruct b/bsp/stm32/stm32l552-st-nucleo/SConstruct index 6d1acee40bf..6a27defff65 100644 --- a/bsp/stm32/stm32l552-st-nucleo/SConstruct +++ b/bsp/stm32/stm32l552-st-nucleo/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/stm32l552-st-nucleo/board/SConscript b/bsp/stm32/stm32l552-st-nucleo/board/SConscript index 46b55262c15..cb5f07626eb 100644 --- a/bsp/stm32/stm32l552-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l552-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/gcc/startup_stm32l552xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/arm/startup_stm32l552xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32L5xx_HAL/CMSIS/Device/ST/STM32L5xx/Source/Templates/iar/startup_stm32l552xx.s'] # You can select chips from the list above diff --git a/bsp/stm32/stm32l552-st-nucleo/rtconfig.py b/bsp/stm32/stm32l552-st-nucleo/rtconfig.py index d648bba7b87..18a9b38c869 100644 --- a/bsp/stm32/stm32l552-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32l552-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armclang' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -95,7 +95,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32mp157a-st-discovery/SConstruct b/bsp/stm32/stm32mp157a-st-discovery/SConstruct index e75b162f9d2..b66fab1255e 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/SConstruct +++ b/bsp/stm32/stm32mp157a-st-discovery/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/stm32mp157a-st-discovery/board/SConscript b/bsp/stm32/stm32mp157a-st-discovery/board/SConscript index 813b2b07347..46a3634f707 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-discovery/board/SConscript @@ -86,11 +86,11 @@ if GetDepend(['BSP_USING_OPENAMP']): startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/gcc/startup_stm32mp15xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/arm/startup_stm32mp15xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/iar/startup_stm32mp15xx.s'] CPPDEFINES = ['CORE_CM4','NO_ATOMIC_64_SUPPORT','METAL_INTERNAL','METAL_MAX_DEVICE_REGIONS=2','VIRTIO_SLAVE_ONLY','STM32MP157Axx','__LOG_TRACE_IO_'] diff --git a/bsp/stm32/stm32mp157a-st-discovery/rtconfig.py b/bsp/stm32/stm32mp157a-st-discovery/rtconfig.py index b4605791cb2..d2446f9fde5 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/rtconfig.py +++ b/bsp/stm32/stm32mp157a-st-discovery/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32mp157a-st-ev1/SConstruct b/bsp/stm32/stm32mp157a-st-ev1/SConstruct index e75b162f9d2..b66fab1255e 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/SConstruct +++ b/bsp/stm32/stm32mp157a-st-ev1/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/stm32mp157a-st-ev1/board/SConscript b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript index 26c2379e22f..2894a63bf50 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript @@ -110,11 +110,11 @@ if GetDepend(['BSP_USING_GBE']): startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/gcc/startup_stm32mp15xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/arm/startup_stm32mp15xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32MPxx_HAL/CMSIS/Device/ST/STM32MP1xx/Source/Templates/iar/startup_stm32mp15xx.s'] src = list(set(src)) diff --git a/bsp/stm32/stm32mp157a-st-ev1/rtconfig.py b/bsp/stm32/stm32mp157a-st-ev1/rtconfig.py index b4605791cb2..d2446f9fde5 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/rtconfig.py +++ b/bsp/stm32/stm32mp157a-st-ev1/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32u575-st-nucleo/SConstruct b/bsp/stm32/stm32u575-st-nucleo/SConstruct index 5d52030247b..b6f563294af 100644 --- a/bsp/stm32/stm32u575-st-nucleo/SConstruct +++ b/bsp/stm32/stm32u575-st-nucleo/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/stm32u575-st-nucleo/board/SConscript b/bsp/stm32/stm32u575-st-nucleo/board/SConscript index 16466feb961..b6874aa2bbf 100644 --- a/bsp/stm32/stm32u575-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32u575-st-nucleo/board/SConscript @@ -17,11 +17,11 @@ path += [cwd + '/CubeMX_Config/Inc'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32U5xx_HAL/CMSIS/Device/ST/STM32U5xx/Source/Templates/gcc/startup_stm32u575xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32U5xx_HAL/CMSIS/Device/ST/STM32U5xx/Source/Templates/arm/startup_stm32u575xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32U5xx_HAL/CMSIS/Device/ST/STM32U5xx/Source/Templates/iar/startup_stm32u575xx.s'] # You can select chips from the list above diff --git a/bsp/stm32/stm32u575-st-nucleo/rtconfig.py b/bsp/stm32/stm32u575-st-nucleo/rtconfig.py index b14888b0241..3f5483a3a90 100644 --- a/bsp/stm32/stm32u575-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32u575-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armclang' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -95,7 +95,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32wb55-st-nucleo/SConstruct b/bsp/stm32/stm32wb55-st-nucleo/SConstruct index 6aeca83d9f5..e4b174906bc 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/SConstruct +++ b/bsp/stm32/stm32wb55-st-nucleo/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/stm32wb55-st-nucleo/board/SConscript b/bsp/stm32/stm32wb55-st-nucleo/board/SConscript index 69fc966ade6..ddbdcaac36a 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32wb55-st-nucleo/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/arm/startup_stm32wb55xx_cm4.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32WBxx_HAL/CMSIS/Device/ST/STM32WBxx/Source/Templates/iar/startup_stm32wb55xx_cm4.s'] # You can select chips from the list above diff --git a/bsp/stm32/stm32wb55-st-nucleo/rtconfig.py b/bsp/stm32/stm32wb55-st-nucleo/rtconfig.py index b6c0783af56..c1f50801663 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32wb55-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32wl55-st-nucleo/SConstruct b/bsp/stm32/stm32wl55-st-nucleo/SConstruct index f3769ce5b6b..674a351c628 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/SConstruct +++ b/bsp/stm32/stm32wl55-st-nucleo/SConstruct @@ -25,7 +25,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/stm32wl55-st-nucleo/board/SConscript b/bsp/stm32/stm32wl55-st-nucleo/board/SConscript index 3766c87592e..71e017096f9 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32wl55-st-nucleo/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s'] CPPDEFINES = ['STM32WLxx'] diff --git a/bsp/stm32/stm32wl55-st-nucleo/rtconfig.py b/bsp/stm32/stm32wl55-st-nucleo/rtconfig.py index fc0386eaea8..c1cd2041993 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/rtconfig.py +++ b/bsp/stm32/stm32wl55-st-nucleo/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct b/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct index f3769ce5b6b..674a351c628 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct @@ -25,7 +25,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/stm32wle5-yizhilian-lm401/board/SConscript b/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript index 3766c87592e..71e017096f9 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s'] CPPDEFINES = ['STM32WLxx'] diff --git a/bsp/stm32/stm32wle5-yizhilian-lm401/rtconfig.py b/bsp/stm32/stm32wle5-yizhilian-lm401/rtconfig.py index fc0386eaea8..c1cd2041993 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/rtconfig.py +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/stm32/stm32wle5-yizhilian-lm402/SConstruct b/bsp/stm32/stm32wle5-yizhilian-lm402/SConstruct index f3769ce5b6b..674a351c628 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm402/SConstruct +++ b/bsp/stm32/stm32wle5-yizhilian-lm402/SConstruct @@ -25,7 +25,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/stm32wle5-yizhilian-lm402/board/SConscript b/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript index 3766c87592e..71e017096f9 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript @@ -18,11 +18,11 @@ path += [cwd + '/ports'] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/gcc/startup_stm32wle5xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/arm/startup_stm32wle5xx.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/STM32WLxx_HAL/CMSIS/Device/ST/STM32WLxx/Source/Templates/iar/startup_stm32wle5xx.s'] CPPDEFINES = ['STM32WLxx'] diff --git a/bsp/stm32/stm32wle5-yizhilian-lm402/rtconfig.py b/bsp/stm32/stm32wle5-yizhilian-lm402/rtconfig.py index fc0386eaea8..c1cd2041993 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm402/rtconfig.py +++ b/bsp/stm32/stm32wle5-yizhilian-lm402/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -127,7 +127,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/swm320/SConstruct b/bsp/swm320/SConstruct index 13d83a4e1f4..c1ecdb58748 100644 --- a/bsp/swm320/SConstruct +++ b/bsp/swm320/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 rtthread.map') diff --git a/bsp/swm320/libraries/SConscript b/bsp/swm320/libraries/SConscript index cad5ffa0e4b..8dce723f1bb 100644 --- a/bsp/swm320/libraries/SConscript +++ b/bsp/swm320/libraries/SConscript @@ -6,11 +6,11 @@ CPPPATH = [cwd + '/CMSIS/CoreSupport', cwd + '/CMSIS/DeviceSupport', cwd + '/SWM src += Glob('SWM320_StdPeriph_Driver/*.c') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['CMSIS/DeviceSupport/startup/gcc/startup_SWM320.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CMSIS/DeviceSupport/startup/arm/startup_SWM320.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['CMSIS/DeviceSupport/startup/iar/startup_SWM320.s'] group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/swm320/rtconfig.py b/bsp/swm320/rtconfig.py index f90b4903920..8fe8bfcbe57 100644 --- a/bsp/swm320/rtconfig.py +++ b/bsp/swm320/rtconfig.py @@ -18,8 +18,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -89,7 +89,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': CC = 'iccarm' CXX = 'iccarm' AS = 'iasmarm' diff --git a/bsp/tae32f5300/Libraries/SConscript b/bsp/tae32f5300/Libraries/SConscript index 2bd9462f576..ae4c35e5fb1 100644 --- a/bsp/tae32f5300/Libraries/SConscript +++ b/bsp/tae32f5300/Libraries/SConscript @@ -39,11 +39,11 @@ if GetDepend(['RT_USING_HWTIMER']) or GetDepend(['RT_USING_PWM'] or GetDepend([' src += ['TAE32F53xx_StdPeriph_Driver/src/tae32f53xx_ll_tmr.c'] #add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src = src + ['CMSIS/Device/Tai_action/TAE32F53xx/Source/GCC/startup_ARMCM3.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src = src + ['CMSIS/Device/Tai_action/TAE32F53xx/Source/startup_tae32f53xx.c'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src = src + ['CMSIS/Device/Tai_action/TAE32F53xx/Source/IAR/startup_ARMCM3.s'] #add headfile script diff --git a/bsp/tae32f5300/SConstruct b/bsp/tae32f5300/SConstruct index 473ed6fbed2..19fba6cd7ff 100644 --- a/bsp/tae32f5300/SConstruct +++ b/bsp/tae32f5300/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 project.map') diff --git a/bsp/tkm32F499/SConstruct b/bsp/tkm32F499/SConstruct index beaf315815a..375dd998e7c 100644 --- a/bsp/tkm32F499/SConstruct +++ b/bsp/tkm32F499/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/tkm32F499/rtconfig.py b/bsp/tkm32F499/rtconfig.py index 4f537ccd48e..1d5dffbecc1 100644 --- a/bsp/tkm32F499/rtconfig.py +++ b/bsp/tkm32F499/rtconfig.py @@ -19,7 +19,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'D:/Keil/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' if os.getenv('RTT_EXEC_PATH'): @@ -118,7 +118,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/tm4c123bsp/SConstruct b/bsp/tm4c123bsp/SConstruct index cdbe61ae64f..9941169c4d2 100644 --- a/bsp/tm4c123bsp/SConstruct +++ b/bsp/tm4c123bsp/SConstruct @@ -30,7 +30,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/tm4c123bsp/board/SConscript b/bsp/tm4c123bsp/board/SConscript index 2b02292d184..b507558f380 100644 --- a/bsp/tm4c123bsp/board/SConscript +++ b/bsp/tm4c123bsp/board/SConscript @@ -17,11 +17,11 @@ path = [cwd] startup_path_prefix = SDK_LIB -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/TivaWare_C_series/tm4c123_driverlib/startup/gcc/startup_gcc.c'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/TivaWare_C_series/tm4c123_driverlib/startup/arm/startup_rvmdk.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [startup_path_prefix + '/TivaWare_C_series/tm4c123_driverlib/startup/iar/startup_rvmdk.S'] diff --git a/bsp/tm4c123bsp/rtconfig.py b/bsp/tm4c123bsp/rtconfig.py index 3767b4264a1..a5be259c787 100644 --- a/bsp/tm4c123bsp/rtconfig.py +++ b/bsp/tm4c123bsp/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/tm4c129x/libraries/SConscript b/bsp/tm4c129x/libraries/SConscript index 1229898cd92..3d153e99841 100644 --- a/bsp/tm4c129x/libraries/SConscript +++ b/bsp/tm4c129x/libraries/SConscript @@ -9,11 +9,11 @@ SrcRemove(src, 'onewire.c') CFLAGS = '' # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['startup/startup_gcc.c'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/startup_rvmdk.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['startup/startup_ewarm.c'] CFLAGS += ' --diag_suppress=pe177' diff --git a/bsp/tm4c129x/rtconfig.py b/bsp/tm4c129x/rtconfig.py index 691d51358b6..6b8a21c8dab 100644 --- a/bsp/tm4c129x/rtconfig.py +++ b/bsp/tm4c129x/rtconfig.py @@ -21,8 +21,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:\Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -84,7 +84,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/upd70f3454/SConstruct b/bsp/upd70f3454/SConstruct index 6abc00e136d..b2bb1fb4176 100644 --- a/bsp/upd70f3454/SConstruct +++ b/bsp/upd70f3454/SConstruct @@ -20,7 +20,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 project.map') diff --git a/bsp/upd70f3454/drivers/SConscript b/bsp/upd70f3454/drivers/SConscript index f8c82bd611a..8e9111c3576 100644 --- a/bsp/upd70f3454/drivers/SConscript +++ b/bsp/upd70f3454/drivers/SConscript @@ -5,9 +5,9 @@ cwd = GetCurrentDir() src_c = Glob('*.c') # add for startup script -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src_asm = ['start_gcc.S', 'vectors_gcc.S', 'interrupts_gcc.S'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src_asm = ['cstartup.asm'] src = File(src_c + src_asm) diff --git a/bsp/upd70f3454/rtconfig.py b/bsp/upd70f3454/rtconfig.py index 638470b6456..c092a84c301 100644 --- a/bsp/upd70f3454/rtconfig.py +++ b/bsp/upd70f3454/rtconfig.py @@ -15,7 +15,7 @@ print('=================================================') exit(0) elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation_0' elif CROSS_TOOL == 'keil': print('================ERROR============================') @@ -56,7 +56,7 @@ POST_ACTION = OBJCPY + ' -O srec $TARGET rtthread.mot\n' + SIZE + ' $TARGET \n' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccv850' AS = 'av850' diff --git a/bsp/w60x/SConstruct b/bsp/w60x/SConstruct index ea5f3d64393..35a7f75de0e 100644 --- a/bsp/w60x/SConstruct +++ b/bsp/w60x/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/w60x/rtconfig.py b/bsp/w60x/rtconfig.py index 254eb4fddca..a3d9e5d64b6 100644 --- a/bsp/w60x/rtconfig.py +++ b/bsp/w60x/rtconfig.py @@ -20,7 +20,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation' if os.getenv('RTT_EXEC_PATH'): @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET \n' POST_ACTION += 'python ./makeimg.py' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/SConscript b/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/SConscript index 4dd8bd50a0a..b3da75ec131 100644 --- a/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/SConscript +++ b/bsp/wch/arm/Libraries/CH32F20x_StdPeriph_Driver/SConscript @@ -36,7 +36,7 @@ path = [ if rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['CMSIS/WCH/CH32F20x/Source/ARM/startup_ch32f20x.s'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['CMSIS/WCH/CH32F20x/Source/GCC/startup_ch32f20x.S'] group = DefineGroup('ch32f20x_lib', src, depend = [''], CPPPATH = path) diff --git a/bsp/wch/arm/ch32f103c8-core/SConstruct b/bsp/wch/arm/ch32f103c8-core/SConstruct index 3a3e0cb8e94..037d3b3db96 100644 --- a/bsp/wch/arm/ch32f103c8-core/SConstruct +++ b/bsp/wch/arm/ch32f103c8-core/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 project.map') diff --git a/bsp/wch/arm/ch32f103c8-core/board/SConscript b/bsp/wch/arm/ch32f103c8-core/board/SConscript index 3f608ecc4a1..ff664fbcfa3 100644 --- a/bsp/wch/arm/ch32f103c8-core/board/SConscript +++ b/bsp/wch/arm/ch32f103c8-core/board/SConscript @@ -17,7 +17,7 @@ startup_path_prefix = SDK_LIB if rtconfig.PLATFORM in ['armcc', 'armclang']: src += [startup_path_prefix + '/CH32F10x_StdPeriph_Driver/CMSIS/WCH/CH32F10x/Source/ARM/startup_ch32f10x.s'] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += [startup_path_prefix + '/CH32F10x_StdPeriph_Driver/CMSIS/WCH/CH32F10x/Source/GCC/startup_ch32f10x.S'] diff --git a/bsp/wch/arm/ch32f103c8-core/rtconfig.py b/bsp/wch/arm/ch32f103c8-core/rtconfig.py index 5f373385735..f761099fc43 100644 --- a/bsp/wch/arm/ch32f103c8-core/rtconfig.py +++ b/bsp/wch/arm/ch32f103c8-core/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/wch/arm/ch32f203r-evt/SConstruct b/bsp/wch/arm/ch32f203r-evt/SConstruct index 1827f72e77f..0b8674798d3 100644 --- a/bsp/wch/arm/ch32f203r-evt/SConstruct +++ b/bsp/wch/arm/ch32f203r-evt/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 project.map') diff --git a/bsp/wch/arm/ch32f203r-evt/rtconfig.py b/bsp/wch/arm/ch32f203r-evt/rtconfig.py index 5f373385735..f761099fc43 100644 --- a/bsp/wch/arm/ch32f203r-evt/rtconfig.py +++ b/bsp/wch/arm/ch32f203r-evt/rtconfig.py @@ -22,8 +22,8 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' - EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' + PLATFORM = 'iccarm' + EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' if os.getenv('RTT_EXEC_PATH'): EXEC_PATH = os.getenv('RTT_EXEC_PATH') @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/wch/arm/ch579m/SConstruct b/bsp/wch/arm/ch579m/SConstruct index 93d521a2fc2..9953d55b5e5 100644 --- a/bsp/wch/arm/ch579m/SConstruct +++ b/bsp/wch/arm/ch579m/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 project.map') diff --git a/bsp/wch/arm/ch579m/rtconfig.py b/bsp/wch/arm/ch579m/rtconfig.py index 2865a4f6420..282795f17ba 100644 --- a/bsp/wch/arm/ch579m/rtconfig.py +++ b/bsp/wch/arm/ch579m/rtconfig.py @@ -22,7 +22,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/IAR' if os.getenv('RTT_EXEC_PATH'): @@ -93,7 +93,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/bsp/wch/risc-v/ch32v103r-evt/SConstruct b/bsp/wch/risc-v/ch32v103r-evt/SConstruct index 9f4c2c13e58..e3fb5cd5d5f 100644 --- a/bsp/wch/risc-v/ch32v103r-evt/SConstruct +++ b/bsp/wch/risc-v/ch32v103r-evt/SConstruct @@ -27,7 +27,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 project.map') diff --git a/bsp/xplorer4330/Libraries/Device/SConscript b/bsp/xplorer4330/Libraries/Device/SConscript index fed180fd71f..8084ff93ff6 100644 --- a/bsp/xplorer4330/Libraries/Device/SConscript +++ b/bsp/xplorer4330/Libraries/Device/SConscript @@ -12,18 +12,18 @@ CPPDEFINES = [rtconfig.USE_CORE] CPPDEFINES += ['USE_SPIFI'] # add for startup script if rtconfig.USE_CORE =='CORE_M4': - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx.s'] - elif rtconfig.CROSS_TOOL == 'iar': + elif rtconfig.PLATFORM in ['iccarm']: src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx.s'] else: - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: src += ['NXP/LPC43xx/Source/Templates/GCC/startup_LPC43xx_M0.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['NXP/LPC43xx/Source/Templates/ARM/startup_LPC43xx_M0.s'] - elif rtconfig.CROSS_TOOL == 'iar': + elif rtconfig.PLATFORM in ['iccarm']: src += ['NXP/LPC43xx/Source/Templates/IAR/startup_LPC43xx_M0.s'] group = DefineGroup('CMSIS', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES) diff --git a/bsp/xplorer4330/M0/rtconfig.py b/bsp/xplorer4330/M0/rtconfig.py index 6902581132c..0ae74a30cde 100644 --- a/bsp/xplorer4330/M0/rtconfig.py +++ b/bsp/xplorer4330/M0/rtconfig.py @@ -28,7 +28,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'D:/Keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 6.0' if os.getenv('RTT_EXEC_PATH'): @@ -92,7 +92,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/xplorer4330/M4/rtconfig.py b/bsp/xplorer4330/M4/rtconfig.py index 465f12eb0ab..aa1b8644d75 100644 --- a/bsp/xplorer4330/M4/rtconfig.py +++ b/bsp/xplorer4330/M4/rtconfig.py @@ -28,7 +28,7 @@ PLATFORM = 'armcc' EXEC_PATH = r'D:/Keil' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 6.0' if os.getenv('RTT_EXEC_PATH'): @@ -92,7 +92,7 @@ POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' AS = 'iasmarm' diff --git a/bsp/yichip/yc3121-pos/Libraries/SConscript b/bsp/yichip/yc3121-pos/Libraries/SConscript index e46f92324c3..76e9f6ffab7 100644 --- a/bsp/yichip/yc3121-pos/Libraries/SConscript +++ b/bsp/yichip/yc3121-pos/Libraries/SConscript @@ -6,11 +6,11 @@ CPPPATH = [cwd + '/sdk', cwd + '/core', cwd] src += Glob('core/*.c') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += ['startup/flash_start_gcc.s'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['startup/startup.s', 'startup/flash_start.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['startup/flash_start_iar.s'] group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/yichip/yc3121-pos/SConstruct b/bsp/yichip/yc3121-pos/SConstruct index eca0a786c88..bdbfaf94b39 100644 --- a/bsp/yichip/yc3121-pos/SConstruct +++ b/bsp/yichip/yc3121-pos/SConstruct @@ -25,7 +25,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 project.map') diff --git a/bsp/yichip/yc3121-pos/rtconfig.py b/bsp/yichip/yc3121-pos/rtconfig.py index f07430c42e2..94f16842ade 100644 --- a/bsp/yichip/yc3121-pos/rtconfig.py +++ b/bsp/yichip/yc3121-pos/rtconfig.py @@ -25,7 +25,7 @@ PLATFORM = 'armcc' EXEC_PATH = 'C:/Keil_v5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' if os.getenv('RTT_EXEC_PATH'): @@ -95,7 +95,7 @@ POST_ACTION = 'fromelf.exe --text -a -c --output=@L_asm.txt "!L" \nfromelf -z $TARGET' -elif PLATFORM == 'iar': +elif PLATFORM == 'iccarm': # toolchains CC = 'iccarm' CXX = 'iccarm' diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript index b409f1196ce..8fe82b73e40 100644 --- a/components/drivers/spi/SConscript +++ b/components/drivers/spi/SConscript @@ -29,7 +29,7 @@ if GetDepend('RT_USING_SFUD'): if GetDepend('RT_SFUD_USING_SFDP'): src_device += ['sfud/src/sfud_sfdp.c'] - if rtconfig.PLATFORM == 'gcc': + if rtconfig.PLATFORM in ['gcc']: LOCAL_CFLAGS += ' -std=c99' elif rtconfig.PLATFORM == 'armcc': LOCAL_CFLAGS += ' --c99' diff --git a/components/libc/compilers/common/SConscript b/components/libc/compilers/common/SConscript index cf57f2abc36..1a341f5ad12 100644 --- a/components/libc/compilers/common/SConscript +++ b/components/libc/compilers/common/SConscript @@ -9,7 +9,7 @@ CPPDEFINES = [] if rtconfig.PLATFORM in ['armcc', 'armclang']: CPPDEFINES += ['__CLK_TCK=RT_TICK_PER_SECOND'] -elif rtconfig.PLATFORM == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: CPPDEFINES += ['CLOCKS_PER_SEC=RT_TICK_PER_SECOND'] # forcly revert to 1 by IAR src += Glob('*.c') diff --git a/components/libc/compilers/common/extension/fcntl/octal/SConscript b/components/libc/compilers/common/extension/fcntl/octal/SConscript index 65e7cf264e0..ed9289b8250 100644 --- a/components/libc/compilers/common/extension/fcntl/octal/SConscript +++ b/components/libc/compilers/common/extension/fcntl/octal/SConscript @@ -6,6 +6,6 @@ cwd = GetCurrentDir() CPPPATH = [cwd] group = [] -if rtconfig.PLATFORM in ['armcc', 'armclang', 'iar']: +if rtconfig.PLATFORM in ['armcc', 'armclang', 'iccarm']: group = DefineGroup('Compiler', src, depend = [''], CPPPATH = CPPPATH) Return('group') diff --git a/components/libc/compilers/dlib/SConscript b/components/libc/compilers/dlib/SConscript index 6f7b61f0006..3b0ccee2e80 100644 --- a/components/libc/compilers/dlib/SConscript +++ b/components/libc/compilers/dlib/SConscript @@ -6,7 +6,7 @@ group = [] CPPDEFINES = ['RT_USING_DLIBC', 'RT_USING_LIBC'] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: if GetDepend('DFS_USING_POSIX'): from distutils.version import LooseVersion from iar import IARVersion diff --git a/components/libc/compilers/newlib/SConscript b/components/libc/compilers/newlib/SConscript index b1d4a53eb1a..ab2d3517e2e 100644 --- a/components/libc/compilers/newlib/SConscript +++ b/components/libc/compilers/newlib/SConscript @@ -9,7 +9,7 @@ group = [] LIBS = [] CPPPATH = [cwd] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: LIBS += ['c', 'm'] # link libc and libm src += Glob('*.c') diff --git a/components/libc/cplusplus/SConscript b/components/libc/cplusplus/SConscript index 325a27f65f3..82983fa6674 100644 --- a/components/libc/cplusplus/SConscript +++ b/components/libc/cplusplus/SConscript @@ -14,7 +14,7 @@ CPPPATH = [cwd] if rtconfig.PLATFORM == 'armclang' and GetDepend('RT_USING_CPLUSPLUS11'): src += Glob('cpp11/armclang/*.cpp') + Glob('cpp11/armclang/*.c') CPPPATH += [cwd + '/cpp11/armclang'] -elif rtconfig.PLATFORM == 'gcc' and GetDepend('RT_USING_CPLUSPLUS11'): +elif rtconfig.PLATFORM in ['gcc'] and GetDepend('RT_USING_CPLUSPLUS11'): src += Glob('cpp11/gcc/*.cpp') + Glob('cpp11/gcc/*.c') CPPPATH += [cwd + '/cpp11/gcc'] diff --git a/components/libc/posix/libdl/SConscript b/components/libc/posix/libdl/SConscript index 7c5f9b80852..146253909f2 100644 --- a/components/libc/posix/libdl/SConscript +++ b/components/libc/posix/libdl/SConscript @@ -6,7 +6,7 @@ cwd = GetCurrentDir() group = [] CPPPATH = [cwd] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: group = DefineGroup('POSIX', src, depend = ['RT_USING_MODULE'], CPPPATH = CPPPATH) Return('group') diff --git a/components/lwp/SConscript b/components/lwp/SConscript index f151f3b92e1..98a7cf368a2 100644 --- a/components/lwp/SConscript +++ b/components/lwp/SConscript @@ -6,7 +6,7 @@ src = [] CPPPATH = [cwd] support_arch = {"arm": ["cortex-m3", "cortex-m4", "cortex-m7", "arm926", "cortex-a"]} -platform_file = {'armcc': 'rvds.S', 'gcc': 'gcc.S', 'iar': 'iar.S'} +platform_file = {'armcc': 'rvds.S', 'gcc': 'gcc.S', 'iccarm': 'iar.S'} if rtconfig.PLATFORM in platform_file.keys(): # support platforms if rtconfig.ARCH in support_arch.keys() and rtconfig.CPU in support_arch[rtconfig.ARCH]: diff --git a/documentation/scons/scons.md b/documentation/scons/scons.md index 5a4d78051b6..51597485b91 100644 --- a/documentation/scons/scons.md +++ b/documentation/scons/scons.md @@ -512,7 +512,7 @@ elif CROSS_TOOL == 'keil': PLATFORM = 'armcc' EXEC_PATH = 'C:/Keilv5' elif CROSS_TOOL == 'iar': - PLATFORM = 'iar' + PLATFORM = 'iccarm' EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation' if os.getenv('RTT_EXEC_PATH'): diff --git a/libcpu/arm/AT91SAM7S/SConscript b/libcpu/arm/AT91SAM7S/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/AT91SAM7S/SConscript +++ b/libcpu/arm/AT91SAM7S/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/AT91SAM7X/SConscript b/libcpu/arm/AT91SAM7X/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/AT91SAM7X/SConscript +++ b/libcpu/arm/AT91SAM7X/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/am335x/SConscript b/libcpu/arm/am335x/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/am335x/SConscript +++ b/libcpu/arm/am335x/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/arm926/SConscript b/libcpu/arm/arm926/SConscript index ed6780b1050..3760ab5ea12 100644 --- a/libcpu/arm/arm926/SConscript +++ b/libcpu/arm/arm926/SConscript @@ -13,11 +13,11 @@ if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') ASFLAGS = ' --cpreproc' -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS) diff --git a/libcpu/arm/armv6/SConscript b/libcpu/arm/armv6/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/armv6/SConscript +++ b/libcpu/arm/armv6/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/common/SConscript b/libcpu/arm/common/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/common/SConscript +++ b/libcpu/arm/common/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/cortex-a/SConscript b/libcpu/arm/cortex-a/SConscript index e593fb3b2e7..78a5e64101f 100644 --- a/libcpu/arm/cortex-a/SConscript +++ b/libcpu/arm/cortex-a/SConscript @@ -26,14 +26,14 @@ if GetDepend('RT_USING_GIC_V3'): if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/cortex-m0/SConscript b/libcpu/arm/cortex-m0/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/cortex-m0/SConscript +++ b/libcpu/arm/cortex-m0/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/cortex-m23/SConscript b/libcpu/arm/cortex-m23/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/cortex-m23/SConscript +++ b/libcpu/arm/cortex-m23/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/cortex-m3/SConscript b/libcpu/arm/cortex-m3/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/cortex-m3/SConscript +++ b/libcpu/arm/cortex-m3/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/cortex-m33/SConscript b/libcpu/arm/cortex-m33/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/cortex-m33/SConscript +++ b/libcpu/arm/cortex-m33/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/cortex-m4/SConscript b/libcpu/arm/cortex-m4/SConscript index 94505d3fb61..b24349c4fc7 100644 --- a/libcpu/arm/cortex-m4/SConscript +++ b/libcpu/arm/cortex-m4/SConscript @@ -14,11 +14,11 @@ if rtconfig.PLATFORM in ['armcc', 'armclang']: if rtconfig.PLATFORM == 'armclang': src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/cortex-m7/SConscript b/libcpu/arm/cortex-m7/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/cortex-m7/SConscript +++ b/libcpu/arm/cortex-m7/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/cortex-r4/SConscript b/libcpu/arm/cortex-r4/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/cortex-r4/SConscript +++ b/libcpu/arm/cortex-r4/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/dm36x/SConscript b/libcpu/arm/dm36x/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/dm36x/SConscript +++ b/libcpu/arm/dm36x/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/lpc214x/SConscript b/libcpu/arm/lpc214x/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/lpc214x/SConscript +++ b/libcpu/arm/lpc214x/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/lpc24xx/SConscript b/libcpu/arm/lpc24xx/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/lpc24xx/SConscript +++ b/libcpu/arm/lpc24xx/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/realview-a8-vmm/SConscript b/libcpu/arm/realview-a8-vmm/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/realview-a8-vmm/SConscript +++ b/libcpu/arm/realview-a8-vmm/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/s3c24x0/SConscript b/libcpu/arm/s3c24x0/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/s3c24x0/SConscript +++ b/libcpu/arm/s3c24x0/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/s3c44b0/SConscript b/libcpu/arm/s3c44b0/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/s3c44b0/SConscript +++ b/libcpu/arm/s3c44b0/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/sep4020/SConscript b/libcpu/arm/sep4020/SConscript index 05f46f3c760..b259a94c946 100644 --- a/libcpu/arm/sep4020/SConscript +++ b/libcpu/arm/sep4020/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/arm/zynqmp-r5/SConscript b/libcpu/arm/zynqmp-r5/SConscript index 61f2b51e125..a98862a8483 100644 --- a/libcpu/arm/zynqmp-r5/SConscript +++ b/libcpu/arm/zynqmp-r5/SConscript @@ -11,11 +11,11 @@ CPPPATH = [cwd] if rtconfig.PLATFORM in ['armcc', 'armclang']: src += Glob('*_rvds.S') -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') group = DefineGroup('cpu', src, depend = [''], CPPPATH = CPPPATH) diff --git a/libcpu/sparc-v8/bm3803/SConscript b/libcpu/sparc-v8/bm3803/SConscript index 03ce583dc10..95df0b4b353 100644 --- a/libcpu/sparc-v8/bm3803/SConscript +++ b/libcpu/sparc-v8/bm3803/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') diff --git a/libcpu/sparc-v8/common/SConscript b/libcpu/sparc-v8/common/SConscript index 03ce583dc10..95df0b4b353 100644 --- a/libcpu/sparc-v8/common/SConscript +++ b/libcpu/sparc-v8/common/SConscript @@ -8,7 +8,7 @@ cwd = GetCurrentDir() src = Glob('*.c') + Glob('*.cpp') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'gcc': +if rtconfig.PLATFORM in ['gcc']: src += Glob('*_init.S') src += Glob('*_gcc.S') diff --git a/tools/building.py b/tools/building.py index deeb8fb620f..e8071881516 100644 --- a/tools/building.py +++ b/tools/building.py @@ -228,7 +228,7 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [ env['LIBLINKSUFFIX'] = '.lib' env['LIBDIRPREFIX'] = '--userlibpath ' - elif rtconfig.PLATFORM == 'iar': + elif rtconfig.PLATFORM == 'iccarm': env['LIBPREFIX'] = '' env['LIBSUFFIX'] = '.a' env['LIBLINKPREFIX'] = '' diff --git a/tools/mkdist.py b/tools/mkdist.py index e2c2b8da505..f0a59cbd17b 100644 --- a/tools/mkdist.py +++ b/tools/mkdist.py @@ -173,7 +173,7 @@ def bs_update_ide_project(bsp_root, rtt_root, rttide = None): if rttide == None: tgt_dict = {'mdk4':('keil', 'armcc'), 'mdk5':('keil', 'armcc'), - 'iar':('iar', 'iar'), + 'iar':('iar', 'iccarm'), 'vs':('msvc', 'cl'), 'vs2012':('msvc', 'cl'), 'cdk':('gcc', 'gcc'),