diff options
Diffstat (limited to 'bsp')
368 files changed, 371 insertions, 371 deletions
diff --git a/bsp/CME_M7/CMSIS/SConscript b/bsp/CME_M7/CMSIS/SConscript index ee315fad3a..a6467b658e 100644 --- a/bsp/CME_M7/CMSIS/SConscript +++ b/bsp/CME_M7/CMSIS/SConscript @@ -15,7 +15,7 @@ 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 4ea0c04a0b..2a4dd7ac50 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/Vango/v85xx/SConstruct b/bsp/Vango/v85xx/SConstruct index 394f300b22..a2b6a7c802 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/v85xxp/SConstruct b/bsp/Vango/v85xxp/SConstruct index ac0a9dcd0d..d40286eaed 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/acm32/acm32f0x0-nucleo/SConstruct b/bsp/acm32/acm32f0x0-nucleo/SConstruct index 8886098e95..93a780e57e 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 d5c9c3d1c6..6aed6c9004 100644 --- a/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript +++ b/bsp/acm32/acm32f0x0-nucleo/libraries/SConscript @@ -29,7 +29,7 @@ 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/acm32f4xx-nucleo/SConstruct b/bsp/acm32/acm32f4xx-nucleo/SConstruct index 09dfa83715..3167763f54 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 ed549a8348..88a351515d 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/SConscript @@ -22,7 +22,7 @@ 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/airm2m/air105/SConstruct b/bsp/airm2m/air105/SConstruct index 70225dbaa6..785bf66c2a 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 ae777e304f..4299186431 100644 --- a/bsp/airm2m/air105/board/SConscript +++ b/bsp/airm2m/air105/board/SConscript @@ -28,7 +28,7 @@ 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/amebaz/SConstruct b/bsp/amebaz/SConstruct index ea5f3d6439..35a7f75de0 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 1682e4724b..6abfd0cfcf 100644 --- a/bsp/amebaz/libraries/smartconfig/SConscript +++ b/bsp/amebaz/libraries/smartconfig/SConscript @@ -9,7 +9,7 @@ libpath = [cwd + '/libs'] 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/apm32/apm32f103xe-minibroard/SConstruct b/bsp/apm32/apm32f103xe-minibroard/SConstruct index adca955a4e..401ecfa098 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 68b886f3d9..ecf44bdd0b 100644 --- a/bsp/apm32/apm32f103xe-minibroard/board/SConscript +++ b/bsp/apm32/apm32f103xe-minibroard/board/SConscript @@ -18,7 +18,7 @@ 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 in ['gcc']: diff --git a/bsp/apollo2/SConstruct b/bsp/apollo2/SConstruct index 26a793486e..ad30eafe90 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 9750e8b73c..fc352aceff 100644 --- a/bsp/apollo2/libraries/startup/SConscript +++ b/bsp/apollo2/libraries/startup/SConscript @@ -14,7 +14,7 @@ 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/at32/at32f403a-start/SConstruct b/bsp/at32/at32f403a-start/SConstruct index 2e8fe7dc96..6128df4d2d 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 5cd2570bbe..1412ec8e61 100644 --- a/bsp/at32/at32f403a-start/board/SConscript +++ b/bsp/at32/at32f403a-start/board/SConscript @@ -21,7 +21,7 @@ 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/at32f407-start/SConstruct b/bsp/at32/at32f407-start/SConstruct index 2e8fe7dc96..6128df4d2d 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 71b75a45a3..82e1ad7c83 100644 --- a/bsp/at32/at32f407-start/board/SConscript +++ b/bsp/at32/at32f407-start/board/SConscript @@ -21,7 +21,7 @@ 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/at32f413-start/SConstruct b/bsp/at32/at32f413-start/SConstruct index 01bab30749..188f212186 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 51fe4c11aa..57b467f6cc 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/at32f415-start/SConstruct b/bsp/at32/at32f415-start/SConstruct index 10eac9bc85..25ab5b6f2d 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 47bfecd047..1845cbcce1 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/at32f435-start/SConstruct b/bsp/at32/at32f435-start/SConstruct index 3cc2879e44..08b2117a9b 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 679953b121..9ef9f730dc 100644 --- a/bsp/at32/at32f435-start/board/SConscript +++ b/bsp/at32/at32f435-start/board/SConscript @@ -21,7 +21,7 @@ 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/at32f437-start/SConstruct b/bsp/at32/at32f437-start/SConstruct index 3cc2879e44..08b2117a9b 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 02323abbd6..cb9ea80bbd 100644 --- a/bsp/at32/at32f437-start/board/SConscript +++ b/bsp/at32/at32f437-start/board/SConscript @@ -21,7 +21,7 @@ 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/at91/at91sam9260/platform/SConscript b/bsp/at91/at91sam9260/platform/SConscript index 7a345490a4..6604d06ef9 100644 --- a/bsp/at91/at91sam9260/platform/SConscript +++ b/bsp/at91/at91sam9260/platform/SConscript @@ -12,7 +12,7 @@ if rtconfig.PLATFORM in ['armcc', 'armclang']: 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/platform/SConscript b/bsp/at91/at91sam9g45/platform/SConscript index 7a345490a4..6604d06ef9 100644 --- a/bsp/at91/at91sam9g45/platform/SConscript +++ b/bsp/at91/at91sam9g45/platform/SConscript @@ -12,7 +12,7 @@ if rtconfig.PLATFORM in ['armcc', 'armclang']: 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/bluetrum/libcpu/cpu/SConscript b/bsp/bluetrum/libcpu/cpu/SConscript index 814ab35cc3..a98862a848 100644 --- a/bsp/bluetrum/libcpu/cpu/SConscript +++ b/bsp/bluetrum/libcpu/cpu/SConscript @@ -15,7 +15,7 @@ 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/essemi/es32f0654/SConstruct b/bsp/essemi/es32f0654/SConstruct index 232c6fca61..615a67aadc 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 e44cd4799b..312b5e8bb8 100644 --- a/bsp/essemi/es32f0654/libraries/SConscript +++ b/bsp/essemi/es32f0654/libraries/SConscript @@ -15,7 +15,7 @@ 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/es32f365x/SConstruct b/bsp/essemi/es32f365x/SConstruct index 5749424b99..3b0fad6deb 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/es32f369x/SConstruct b/bsp/essemi/es32f369x/SConstruct index 232c6fca61..615a67aadc 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 cc1137a013..bfac4db471 100644 --- a/bsp/essemi/es32f369x/libraries/SConscript +++ b/bsp/essemi/es32f369x/libraries/SConscript @@ -15,7 +15,7 @@ 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/fm33lc026/SConstruct b/bsp/fm33lc026/SConstruct index 79fc1d0f6f..f0e4bc44a4 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 6d5f420999..065f1e5abd 100644 --- a/bsp/fm33lc026/board/SConscript +++ b/bsp/fm33lc026/board/SConscript @@ -19,7 +19,7 @@ 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/frdm-k64f/SConstruct b/bsp/frdm-k64f/SConstruct index 492622db79..8e5bb67374 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 6b0192030b..d8d9790bb2 100644 --- a/bsp/frdm-k64f/device/SConscript +++ b/bsp/frdm-k64f/device/SConscript @@ -17,7 +17,7 @@ if rtconfig.PLATFORM in ['gcc']: 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 0c05aad12c..12634e699d 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 204916b108..866799a6bb 100644 --- a/bsp/ft32/ft32f072xb-starter/board/SConscript +++ b/bsp/ft32/ft32f072xb-starter/board/SConscript @@ -19,7 +19,7 @@ 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/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript b/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript index 04533a3a77..dd86cc6aba 100644 --- a/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf500r/CMSIS/SConscript @@ -9,7 +9,7 @@ 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 5b6608b353..9d9ed87ca8 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/mb9bf506r/SConstruct b/bsp/fujitsu/mb9x/mb9bf506r/SConstruct index 83fa4a0ca9..c230d6ed5f 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 a2f153d0f3..2799cefa6b 100644 --- a/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf506r/libraries/SConscript @@ -11,7 +11,7 @@ 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/mb9bf568r/SConstruct b/bsp/fujitsu/mb9x/mb9bf568r/SConstruct index d8380c4595..67eeafa3d1 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 20f7ce210a..940078d2e3 100644 --- a/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript +++ b/bsp/fujitsu/mb9x/mb9bf618s/CMSIS/SConscript @@ -12,7 +12,7 @@ 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 83fa4a0ca9..c230d6ed5f 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/gd32/gd32103c-eval/SConstruct b/bsp/gd32/gd32103c-eval/SConstruct index 49074397d0..4ae47cd02f 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 54e06454b7..0762046a90 100644 --- a/bsp/gd32/gd32103c-eval/board/SConscript +++ b/bsp/gd32/gd32103c-eval/board/SConscript @@ -19,7 +19,7 @@ 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/gd32105c-eval/SConstruct b/bsp/gd32/gd32105c-eval/SConstruct index 49074397d0..4ae47cd02f 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 39be26bc05..a85b0a42ae 100644 --- a/bsp/gd32/gd32105c-eval/board/SConscript +++ b/bsp/gd32/gd32105c-eval/board/SConscript @@ -19,7 +19,7 @@ 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/SConstruct b/bsp/gd32/gd32105r-start/SConstruct index 49074397d0..4ae47cd02f 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 39be26bc05..a85b0a42ae 100644 --- a/bsp/gd32/gd32105r-start/board/SConscript +++ b/bsp/gd32/gd32105r-start/board/SConscript @@ -19,7 +19,7 @@ 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/SConstruct b/bsp/gd32/gd32107c-eval/SConstruct index 49074397d0..4ae47cd02f 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 39be26bc05..a85b0a42ae 100644 --- a/bsp/gd32/gd32107c-eval/board/SConscript +++ b/bsp/gd32/gd32107c-eval/board/SConscript @@ -19,7 +19,7 @@ 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/gd32205r-start/SConstruct b/bsp/gd32/gd32205r-start/SConstruct index 14ab8b82ea..9a8dd0f14d 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 3bd0ee59a8..e3e280f6ae 100644 --- a/bsp/gd32/gd32205r-start/board/SConscript +++ b/bsp/gd32/gd32205r-start/board/SConscript @@ -19,7 +19,7 @@ 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/gd32303e-eval/SConstruct b/bsp/gd32/gd32303e-eval/SConstruct index f32e96f624..d733bb923d 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 a93216df45..4952e20f50 100644 --- a/bsp/gd32/gd32303e-eval/board/SConscript +++ b/bsp/gd32/gd32303e-eval/board/SConscript @@ -19,7 +19,7 @@ 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/gd32305r-start/SConstruct b/bsp/gd32/gd32305r-start/SConstruct index f32e96f624..d733bb923d 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 9b475a9838..09ae44cf73 100644 --- a/bsp/gd32/gd32305r-start/board/SConscript +++ b/bsp/gd32/gd32305r-start/board/SConscript @@ -19,7 +19,7 @@ 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/gd32407v-start/SConstruct b/bsp/gd32/gd32407v-start/SConstruct index 71deeebad1..2e0cd022f1 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 0930d7eb9c..0d775ec7dc 100644 --- a/bsp/gd32/gd32407v-start/board/SConscript +++ b/bsp/gd32/gd32407v-start/board/SConscript @@ -19,7 +19,7 @@ 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/gd32450i-eval/SConstruct b/bsp/gd32/gd32450i-eval/SConstruct index 71deeebad1..2e0cd022f1 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 6c8121b586..cc9fd76fbd 100644 --- a/bsp/gd32/gd32450i-eval/board/SConscript +++ b/bsp/gd32/gd32450i-eval/board/SConscript @@ -19,7 +19,7 @@ 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/SConstruct b/bsp/gd32/gd32450z-eval/SConstruct index 71deeebad1..2e0cd022f1 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 6c8121b586..cc9fd76fbd 100644 --- a/bsp/gd32/gd32450z-eval/board/SConscript +++ b/bsp/gd32/gd32450z-eval/board/SConscript @@ -19,7 +19,7 @@ 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/gd32105c-eval/Libraries/SConscript b/bsp/gd32105c-eval/Libraries/SConscript index f387300a3f..9310cdf80c 100644 --- a/bsp/gd32105c-eval/Libraries/SConscript +++ b/bsp/gd32105c-eval/Libraries/SConscript @@ -14,7 +14,7 @@ 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 1bde67c902..6712d0169f 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/gd32107c-eval/Libraries/SConscript b/bsp/gd32107c-eval/Libraries/SConscript index f387300a3f..9310cdf80c 100644 --- a/bsp/gd32107c-eval/Libraries/SConscript +++ b/bsp/gd32107c-eval/Libraries/SConscript @@ -14,7 +14,7 @@ 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 1bde67c902..6712d0169f 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/gd32303e-eval/Libraries/SConscript b/bsp/gd32303e-eval/Libraries/SConscript index 7acfcb5d77..42bfdc9a87 100644 --- a/bsp/gd32303e-eval/Libraries/SConscript +++ b/bsp/gd32303e-eval/Libraries/SConscript @@ -14,7 +14,7 @@ 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 1bde67c902..6712d0169f 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/gd32350r-eval/Libraries/SConscript b/bsp/gd32350r-eval/Libraries/SConscript index e2f97da936..a1a55b196f 100644 --- a/bsp/gd32350r-eval/Libraries/SConscript +++ b/bsp/gd32350r-eval/Libraries/SConscript @@ -14,7 +14,7 @@ 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 208ab935b9..644ffee2ae 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/gd32450z-eval/Libraries/SConscript b/bsp/gd32450z-eval/Libraries/SConscript index 98a49626a3..1ee18f08c0 100644 --- a/bsp/gd32450z-eval/Libraries/SConscript +++ b/bsp/gd32450z-eval/Libraries/SConscript @@ -14,7 +14,7 @@ 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 6b5d561848..8190948a33 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/gd32e230k-start/Libraries/SConscript b/bsp/gd32e230k-start/Libraries/SConscript index 7d8683a664..c531f34b31 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 13bbaca0b0..7b40e97402 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/hc32/ev_hc32f4a0_lqfp176/SConstruct b/bsp/hc32/ev_hc32f4a0_lqfp176/SConstruct index b255bbb97a..e316b76d4d 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 d7b3e516ea..367847c322 100644 --- a/bsp/hc32/ev_hc32f4a0_lqfp176/board/SConscript +++ b/bsp/hc32/ev_hc32f4a0_lqfp176/board/SConscript @@ -25,7 +25,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/hc32f460/Libraries/SConscript b/bsp/hc32f460/Libraries/SConscript index 87b87a0fe3..987b437a02 100644 --- a/bsp/hc32f460/Libraries/SConscript +++ b/bsp/hc32f460/Libraries/SConscript @@ -32,7 +32,7 @@ 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 3ab7286424..d1ac0fc2aa 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/hc32l136/Libraries/SConscript b/bsp/hc32l136/Libraries/SConscript index 97f96c22d9..9877efe6da 100644 --- a/bsp/hc32l136/Libraries/SConscript +++ b/bsp/hc32l136/Libraries/SConscript @@ -33,7 +33,7 @@ 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 7299f4d4b4..68378bc0fb 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/hc32l196/Libraries/SConscript b/bsp/hc32l196/Libraries/SConscript index ac60d10ce8..d4a66b0794 100644 --- a/bsp/hc32l196/Libraries/SConscript +++ b/bsp/hc32l196/Libraries/SConscript @@ -25,7 +25,7 @@ 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 036c84e1d5..61f0758bec 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/hk32/hk32f030c8-mini/SConstruct b/bsp/hk32/hk32f030c8-mini/SConstruct index 3840290311..6ec5f496a9 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 d0dd1836b7..896a036b4c 100644 --- a/bsp/hk32/hk32f030c8-mini/board/SConscript +++ b/bsp/hk32/hk32f030c8-mini/board/SConscript @@ -22,7 +22,7 @@ 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/imx6sx/cortex-a9/cpu/SConscript b/bsp/imx6sx/cortex-a9/cpu/SConscript index 749ff47e1b..9c27632503 100644 --- a/bsp/imx6sx/cortex-a9/cpu/SConscript +++ b/bsp/imx6sx/cortex-a9/cpu/SConscript @@ -5,7 +5,7 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') elif rtconfig.PLATFORM in ['gcc']: src += Glob('*_gcc.S') diff --git a/bsp/imxrt/imxrt1021-nxp-evk/SConstruct b/bsp/imxrt/imxrt1021-nxp-evk/SConstruct index 5979f0a945..8c8f750159 100644 --- a/bsp/imxrt/imxrt1021-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1021-nxp-evk/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/imxrt/imxrt1052-atk-commander/SConstruct b/bsp/imxrt/imxrt1052-atk-commander/SConstruct index 55ebf9d391..f7eb3c0c5e 100644 --- a/bsp/imxrt/imxrt1052-atk-commander/SConstruct +++ b/bsp/imxrt/imxrt1052-atk-commander/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/imxrt/imxrt1052-fire-pro/SConstruct b/bsp/imxrt/imxrt1052-fire-pro/SConstruct index 55ebf9d391..f7eb3c0c5e 100644 --- a/bsp/imxrt/imxrt1052-fire-pro/SConstruct +++ b/bsp/imxrt/imxrt1052-fire-pro/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/imxrt/imxrt1052-nxp-evk/SConstruct b/bsp/imxrt/imxrt1052-nxp-evk/SConstruct index 42b12299a3..b2f0587d56 100644 --- a/bsp/imxrt/imxrt1052-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1052-nxp-evk/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct b/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct index 55ebf9d391..f7eb3c0c5e 100644 --- a/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct +++ b/bsp/imxrt/imxrt1052-seeed-ArchMix/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/imxrt/imxrt1060-nxp-evk/SConstruct b/bsp/imxrt/imxrt1060-nxp-evk/SConstruct index b9be046c72..a45850ddd7 100644 --- a/bsp/imxrt/imxrt1060-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1060-nxp-evk/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct b/bsp/imxrt/imxrt1064-nxp-evk/SConstruct index 96668a9c4c..30ea7676b8 100644 --- a/bsp/imxrt/imxrt1064-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1064-nxp-evk/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/imxrt/imxrt1170-nxp-evk/SConstruct b/bsp/imxrt/imxrt1170-nxp-evk/SConstruct index 32310b0942..622d3d16f0 100644 --- a/bsp/imxrt/imxrt1170-nxp-evk/SConstruct +++ b/bsp/imxrt/imxrt1170-nxp-evk/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/imxrt/libraries/MIMXRT1020/SConscript b/bsp/imxrt/libraries/MIMXRT1020/SConscript index 812147e138..4a1a35c28b 100644 --- a/bsp/imxrt/libraries/MIMXRT1020/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1020/SConscript @@ -14,7 +14,7 @@ if rtconfig.CROSS_TOOL == 'gcc': src += ['MIMXRT1021/gcc/startup_MIMXRT1021.S'] elif rtconfig.CROSS_TOOL == 'keil': src += ['MIMXRT1021/arm/startup_MIMXRT1021.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['MIMXRT1021/iar/startup_MIMXRT1021.s'] if GetDepend(['BSP_USING_GPIO']): diff --git a/bsp/imxrt/libraries/MIMXRT1050/SConscript b/bsp/imxrt/libraries/MIMXRT1050/SConscript index e39658fae2..cd7e682947 100644 --- a/bsp/imxrt/libraries/MIMXRT1050/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1050/SConscript @@ -14,7 +14,7 @@ if rtconfig.PLATFORM in ['gcc']: src += ['MIMXRT1052/gcc/startup_MIMXRT1052.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MIMXRT1052/arm/startup_MIMXRT1052.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['MIMXRT1052/iar/startup_MIMXRT1052.s'] if GetDepend(['BSP_USING_GPIO']): diff --git a/bsp/imxrt/libraries/MIMXRT1060/SConscript b/bsp/imxrt/libraries/MIMXRT1060/SConscript index 211adc3c83..84568cbb65 100644 --- a/bsp/imxrt/libraries/MIMXRT1060/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1060/SConscript @@ -15,7 +15,7 @@ if rtconfig.PLATFORM in ['gcc']: src += ['MIMXRT1060/gcc/startup_MIMXRT1062.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MIMXRT1060/arm/startup_MIMXRT1062.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['MIMXRT1060/iar/startup_MIMXRT1062.s'] if GetDepend(['BSP_USING_GPIO']): diff --git a/bsp/imxrt/libraries/MIMXRT1064/SConscript b/bsp/imxrt/libraries/MIMXRT1064/SConscript index 4c62bc22f2..be1b31eb08 100644 --- a/bsp/imxrt/libraries/MIMXRT1064/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1064/SConscript @@ -14,7 +14,7 @@ if rtconfig.PLATFORM in ['gcc']: src += ['MIMXRT1064/gcc/startup_MIMXRT1064.S'] elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += ['MIMXRT1064/arm/startup_MIMXRT1064.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['MIMXRT1064/iar/startup_MIMXRT1064.s'] if GetDepend(['BSP_USING_GPIO']): diff --git a/bsp/imxrt/libraries/MIMXRT1170/SConscript b/bsp/imxrt/libraries/MIMXRT1170/SConscript index c0d93ab72b..60e27099ef 100644 --- a/bsp/imxrt/libraries/MIMXRT1170/SConscript +++ b/bsp/imxrt/libraries/MIMXRT1170/SConscript @@ -18,7 +18,7 @@ if rtconfig.CROSS_TOOL == 'gcc': src += ['MIMXRT1176/gcc/startup_MIMXRT1176_cm7.S'] elif rtconfig.CROSS_TOOL == 'keil': src += ['MIMXRT1176/arm/startup_MIMXRT1176_cm7.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += ['MIMXRT1176/iar/startup_MIMXRT1176_cm7.s'] if GetDepend(['BSP_USING_GPIO']): diff --git a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct b/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct index 923c623f17..e4b3f6c66a 100644 --- a/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct +++ b/bsp/imxrt/libraries/templates/imxrt1050xxx/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct b/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct index a3f416164f..e5611ff1e6 100644 --- a/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct +++ b/bsp/imxrt/libraries/templates/imxrt1064xxx/SConstruct @@ -37,7 +37,7 @@ else: env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') diff --git a/bsp/lm3s8962/Libraries/SConscript b/bsp/lm3s8962/Libraries/SConscript index e279d05130..b87d7d3c6e 100644 --- a/bsp/lm3s8962/Libraries/SConscript +++ b/bsp/lm3s8962/Libraries/SConscript @@ -15,7 +15,7 @@ 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 f4fd7f50c3..ea4b469c85 100644 --- a/bsp/lm3s9b9x/Libraries/SConscript +++ b/bsp/lm3s9b9x/Libraries/SConscript @@ -15,7 +15,7 @@ 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 65db55f77c..c6809cafc4 100644 --- a/bsp/lm4f232/Libraries/SConscript +++ b/bsp/lm4f232/Libraries/SConscript @@ -15,7 +15,7 @@ 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] diff --git a/bsp/lpc176x/CMSIS/SConscript b/bsp/lpc176x/CMSIS/SConscript index 06a2fa04b9..d6650de4cc 100644 --- a/bsp/lpc176x/CMSIS/SConscript +++ b/bsp/lpc176x/CMSIS/SConscript @@ -11,7 +11,7 @@ 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 d99a3c0d92..07d225b1e4 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/lpc178x/CMSIS/SConscript b/bsp/lpc178x/CMSIS/SConscript index 69866e8185..95020fc517 100644 --- a/bsp/lpc178x/CMSIS/SConscript +++ b/bsp/lpc178x/CMSIS/SConscript @@ -12,7 +12,7 @@ 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/lpc408x/Libraries/Device/SConscript b/bsp/lpc408x/Libraries/Device/SConscript index 8ae85deb6a..53360e1861 100644 --- a/bsp/lpc408x/Libraries/Device/SConscript +++ b/bsp/lpc408x/Libraries/Device/SConscript @@ -15,7 +15,7 @@ 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 4c7358b15f..dc6db0a31c 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 da99bf9cc8..8084ff93ff 100644 --- a/bsp/lpc43xx/Libraries/Device/SConscript +++ b/bsp/lpc43xx/Libraries/Device/SConscript @@ -16,14 +16,14 @@ if rtconfig.USE_CORE =='CORE_M4': 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 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/lpc54114-lite/Libraries/devices/LPC54114/SConscript b/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript index 964eb63027..b9e8837361 100644 --- a/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript +++ b/bsp/lpc54114-lite/Libraries/devices/LPC54114/SConscript @@ -18,7 +18,7 @@ if rtconfig.PLATFORM in ['gcc']: 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 5a25d0f302..4f41969faa 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/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript b/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript index 74df4f5c3b..a825e38432 100644 --- a/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript +++ b/bsp/lpc54608-LPCXpresso/SDK_2.2_LPCXpresso54608/devices/LPC54608/SConscript @@ -18,7 +18,7 @@ if rtconfig.PLATFORM in ['gcc']: 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 59b34b8039..4555af0682 100644 --- a/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript +++ b/bsp/lpc55sxx/Libraries/LPC55S6X/SConscript @@ -11,7 +11,7 @@ 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'] @@ -62,7 +62,7 @@ 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 105aaa78ab..679bd64947 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/lpc55s69_nxp_evk/SConstruct b/bsp/lpc55sxx/lpc55s69_nxp_evk/SConstruct index 4ad8f1ca86..91e65db7a6 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_ns/SConstruct b/bsp/lpc55sxx/lpc55s69_nxp_evk_ns/SConstruct index 105aaa78ab..679bd64947 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/lpc824/Libraries/SConscript b/bsp/lpc824/Libraries/SConscript index 13a0c5cdc4..2c998eee64 100644 --- a/bsp/lpc824/Libraries/SConscript +++ b/bsp/lpc824/Libraries/SConscript @@ -16,7 +16,7 @@ if rtconfig.PLATFORM in ['gcc']: 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 bd588f5ae0..f0545203db 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/m16c62p/SConstruct b/bsp/m16c62p/SConstruct index 5ce63cff7b..9f58a22977 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 0d9bb792c0..e16c1a16dd 100644 --- a/bsp/m16c62p/drivers/SConscript +++ b/bsp/m16c62p/drivers/SConscript @@ -7,7 +7,7 @@ src_c = Glob('*.c') # add for startup script 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/maxim/MAX32660_EVSYS/SConstruct b/bsp/maxim/MAX32660_EVSYS/SConstruct index 4e6effe746..76cd7bd3db 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 f099d2fcac..19184e9f51 100644 --- a/bsp/maxim/MAX32660_EVSYS/board/SConscript +++ b/bsp/maxim/MAX32660_EVSYS/board/SConscript @@ -19,7 +19,7 @@ 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/microchip/samc21/SConstruct b/bsp/microchip/samc21/SConstruct index 9f8b13d9cf..1a7569d7b8 100644 --- a/bsp/microchip/samc21/SConstruct +++ b/bsp/microchip/samc21/SConstruct @@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'], LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread-'+ rtconfig.DEVICE_PART + '.map') diff --git a/bsp/microchip/samc21/bsp/SConscript b/bsp/microchip/samc21/bsp/SConscript index 10bc9ad0c1..8dd9b66e1f 100644 --- a/bsp/microchip/samc21/bsp/SConscript +++ b/bsp/microchip/samc21/bsp/SConscript @@ -37,7 +37,7 @@ if rtconfig.PLATFORM in ['gcc']: elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/samc21/armcc/arm_addon/armcc/' + 'system_samc21.c'] src += [cwd + '/samc21/armcc/arm_addon/armcc/arm/' + 'startup_samc21.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/samc21/iar/' + 'system_samc21.c'] src += [cwd + '/samc21/iar/iar/' + 'startup_samc21.c'] diff --git a/bsp/microchip/same54/SConstruct b/bsp/microchip/same54/SConstruct index 9f8b13d9cf..1a7569d7b8 100644 --- a/bsp/microchip/same54/SConstruct +++ b/bsp/microchip/same54/SConstruct @@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'], LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread-'+ rtconfig.DEVICE_PART + '.map') diff --git a/bsp/microchip/same54/bsp/SConscript b/bsp/microchip/same54/bsp/SConscript index e2e8067592..579242efa8 100644 --- a/bsp/microchip/same54/bsp/SConscript +++ b/bsp/microchip/same54/bsp/SConscript @@ -41,7 +41,7 @@ if rtconfig.PLATFORM in ['gcc']: elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/armcc/arm_addon/armcc/' + 'system_same54.c'] src += [cwd + '/armcc/arm_addon/armcc/arm/' + 'startup_same54.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/iar/' + 'system_same54.c'] src += [cwd + '/iar/iar/' + 'startup_same54.c'] diff --git a/bsp/microchip/same70/SConstruct b/bsp/microchip/same70/SConstruct index 9f8b13d9cf..1a7569d7b8 100644 --- a/bsp/microchip/same70/SConstruct +++ b/bsp/microchip/same70/SConstruct @@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'], LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread-'+ rtconfig.DEVICE_PART + '.map') diff --git a/bsp/microchip/same70/bsp/SConscript b/bsp/microchip/same70/bsp/SConscript index dc8d9d46e3..28b8d6cadc 100644 --- a/bsp/microchip/same70/bsp/SConscript +++ b/bsp/microchip/same70/bsp/SConscript @@ -35,7 +35,7 @@ if rtconfig.PLATFORM in ['gcc']: elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/same70b/armcc/Source/' + 'system_same70q21b.c'] src += [cwd + '/same70b/armcc/Source/ARM/' + 'startup_SAME70.s'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/same70b/iar/' + 'system_same70q21b.c'] src += [cwd + '/same70b/iar/iar/' + 'startup_same70q21b.c'] diff --git a/bsp/microchip/saml10/SConstruct b/bsp/microchip/saml10/SConstruct index 9f8b13d9cf..1a7569d7b8 100644 --- a/bsp/microchip/saml10/SConstruct +++ b/bsp/microchip/saml10/SConstruct @@ -26,7 +26,7 @@ env = Environment(tools = ['mingw'], LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) env.PrependENVPath('PATH', rtconfig.EXEC_PATH) -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: env.Replace(CCCOM = ['$CC $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread-'+ rtconfig.DEVICE_PART + '.map') diff --git a/bsp/microchip/saml10/bsp/SConscript b/bsp/microchip/saml10/bsp/SConscript index 33ebccce07..54f1cdd249 100644 --- a/bsp/microchip/saml10/bsp/SConscript +++ b/bsp/microchip/saml10/bsp/SConscript @@ -34,7 +34,7 @@ if rtconfig.PLATFORM in ['gcc']: elif rtconfig.PLATFORM in ['armcc', 'armclang']: src += [cwd + '/gcc/system_saml10e16a.c'] src += [cwd + '/gcc/gcc/startup_saml10e16a.c'] -elif rtconfig.CROSS_TOOL == 'iar': +elif rtconfig.PLATFORM in ['iccarm']: src += [cwd + '/iar/system_saml10e16a.c'] src += [cwd + '/iar/iar/startup_saml10e16a.c'] diff --git a/bsp/mm32f103x/Libraries/SConscript b/bsp/mm32f103x/Libraries/SConscript index 4d2f0588a6..2d4f2b3371 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 afbbe07947..9c29eeb2b5 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/mm32f327x/Libraries/SConscript b/bsp/mm32f327x/Libraries/SConscript index 8141d25bc1..1b178b97f8 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 afbbe07947..9c29eeb2b5 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/mm32l07x/Libraries/SConscript b/bsp/mm32l07x/Libraries/SConscript index 586f3f45f6..2bbf66e49a 100644 --- a/bsp/mm32l07x/Libraries/SConscript +++ b/bsp/mm32l07x/Libraries/SConscript @@ -11,7 +11,7 @@ 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 afbbe07947..9c29eeb2b5 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/mm32l3xx/Libraries/SConscript b/bsp/mm32l3xx/Libraries/SConscript index 4190085e28..0c1186fa31 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 afbbe07947..9c29eeb2b5 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/n32g452xx/n32g452xx-mini-system/SConstruct b/bsp/n32g452xx/n32g452xx-mini-system/SConstruct index cd2bd800d3..e68bf958e8 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/nrf5x/libraries/templates/nrfx/SConstruct b/bsp/nrf5x/libraries/templates/nrfx/SConstruct index 798344bc7f..b7857b2e11 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 798344bc7f..b7857b2e11 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 798344bc7f..b7857b2e11 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 798344bc7f..b7857b2e11 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 798344bc7f..b7857b2e11 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 e1fa180868..316f5d2e77 100644 --- a/bsp/nuvoton/libraries/m031/Device/SConscript +++ b/bsp/nuvoton/libraries/m031/Device/SConscript @@ -15,7 +15,7 @@ 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/m2354/Device/SConscript b/bsp/nuvoton/libraries/m2354/Device/SConscript index 930e35b055..6d119ce408 100644 --- a/bsp/nuvoton/libraries/m2354/Device/SConscript +++ b/bsp/nuvoton/libraries/m2354/Device/SConscript @@ -15,7 +15,7 @@ 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/m480/Device/SConscript b/bsp/nuvoton/libraries/m480/Device/SConscript index dd276f9219..ea24c630d7 100644 --- a/bsp/nuvoton/libraries/m480/Device/SConscript +++ b/bsp/nuvoton/libraries/m480/Device/SConscript @@ -15,7 +15,7 @@ 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/numaker-iot-m487/SConstruct b/bsp/nuvoton/numaker-iot-m487/SConstruct index cc38eb1ecc..f4c3214c30 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-m032ki/SConstruct b/bsp/nuvoton/numaker-m032ki/SConstruct index b430630916..448c5353b1 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-m2354/SConstruct b/bsp/nuvoton/numaker-m2354/SConstruct index 28fa08c9d6..4b77f1a736 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-pfm-m487/SConstruct b/bsp/nuvoton/numaker-pfm-m487/SConstruct index cc38eb1ecc..f4c3214c30 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/nv32f100x/SConstruct b/bsp/nv32f100x/SConstruct index d4fd389691..b943bd2ba9 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/qemu-vexpress-gemini/cpu/SConscript b/bsp/qemu-vexpress-gemini/cpu/SConscript index 749ff47e1b..9c27632503 100644 --- a/bsp/qemu-vexpress-gemini/cpu/SConscript +++ b/bsp/qemu-vexpress-gemini/cpu/SConscript @@ -5,7 +5,7 @@ cwd = GetCurrentDir() src = Glob('*.c') CPPPATH = [cwd] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: src += Glob('*_iar.S') elif rtconfig.PLATFORM in ['gcc']: src += Glob('*_gcc.S') diff --git a/bsp/renesas/libraries/bsp-template/SConscript b/bsp/renesas/libraries/bsp-template/SConscript index 0ba7c23d3f..6a57c550af 100644 --- a/bsp/renesas/libraries/bsp-template/SConscript +++ b/bsp/renesas/libraries/bsp-template/SConscript @@ -9,7 +9,7 @@ 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 in ['gcc']: diff --git a/bsp/renesas/libraries/bsp-template/SConstruct b/bsp/renesas/libraries/bsp-template/SConstruct index 4a16be573d..d00d0dbeaa 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/ra/SConscript b/bsp/renesas/libraries/bsp-template/ra/SConscript index 93dd838d9e..ec190608c8 100644 --- a/bsp/renesas/libraries/bsp-template/ra/SConscript +++ b/bsp/renesas/libraries/bsp-template/ra/SConscript @@ -7,7 +7,7 @@ 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 in ['gcc']: diff --git a/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript b/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript index 6cfaf3d933..2d02f21e9b 100644 --- a/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript +++ b/bsp/renesas/libraries/bsp-template/ra_cfg/SConscript @@ -7,7 +7,7 @@ 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 in ['gcc']: diff --git a/bsp/renesas/libraries/bsp-template/ra_gen/SConscript b/bsp/renesas/libraries/bsp-template/ra_gen/SConscript index b745cb60ac..bbf3579ec9 100644 --- a/bsp/renesas/libraries/bsp-template/ra_gen/SConscript +++ b/bsp/renesas/libraries/bsp-template/ra_gen/SConscript @@ -7,7 +7,7 @@ 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 in ['gcc']: diff --git a/bsp/renesas/ra6m4-cpk/SConscript b/bsp/renesas/ra6m4-cpk/SConscript index 0ba7c23d3f..6a57c550af 100644 --- a/bsp/renesas/ra6m4-cpk/SConscript +++ b/bsp/renesas/ra6m4-cpk/SConscript @@ -9,7 +9,7 @@ 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 in ['gcc']: diff --git a/bsp/renesas/ra6m4-cpk/SConstruct b/bsp/renesas/ra6m4-cpk/SConstruct index 4a16be573d..d00d0dbeaa 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/ra/SConscript b/bsp/renesas/ra6m4-cpk/ra/SConscript index 93dd838d9e..ec190608c8 100644 --- a/bsp/renesas/ra6m4-cpk/ra/SConscript +++ b/bsp/renesas/ra6m4-cpk/ra/SConscript @@ -7,7 +7,7 @@ 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 in ['gcc']: diff --git a/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript b/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript index 93f3278355..698fd28ee0 100644 --- a/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript +++ b/bsp/renesas/ra6m4-cpk/ra_cfg/SConscript @@ -7,7 +7,7 @@ src = [] group = [] CPPPATH = [] -if rtconfig.PLATFORM == 'iar': +if rtconfig.PLATFORM in ['iccarm']: print("\nThe current project does not support iar build\n") Return('group') diff --git a/bsp/renesas/ra6m4-cpk/ra_gen/SConscript b/bsp/renesas/ra6m4-cpk/ra_gen/SConscript index c7e961c75e..9f35703f50 100644 --- a/bsp/renesas/ra6m4-cpk/ra_gen/SConscript +++ b/bsp/renesas/ra6m4-cpk/ra_gen/SConscript @@ -7,7 +7,7 @@ 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 in ['gcc'] : diff --git a/bsp/renesas/ra6m4-iot/SConscript b/bsp/renesas/ra6m4-iot/SConscript index 370c0b0280..f06753e844 100644 --- a/bsp/renesas/ra6m4-iot/SConscript +++ b/bsp/renesas/ra6m4-iot/SConscript @@ -9,7 +9,7 @@ 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 in ['gcc'] : diff --git a/bsp/renesas/ra6m4-iot/SConstruct b/bsp/renesas/ra6m4-iot/SConstruct index 4a16be573d..d00d0dbeaa 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/ra/SConscript b/bsp/renesas/ra6m4-iot/ra/SConscript index 7c50369d5a..346f20faf7 100644 --- a/bsp/renesas/ra6m4-iot/ra/SConscript +++ b/bsp/renesas/ra6m4-iot/ra/SConscript @@ -7,7 +7,7 @@ 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 in ['gcc'] : diff --git a/bsp/renesas/ra6m4-iot/ra_cfg/SConscript b/bsp/renesas/ra6m4-iot/ra_cfg/SConscript index 1386e09ed2..d4a8e56397 100644 --- a/bsp/renesas/ra6m4-iot/ra_cfg/SConscript +++ b/bsp/renesas/ra6m4-iot/ra_cfg/SConscript @@ -7,7 +7,7 @@ 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 in ['gcc'] : diff --git a/bsp/renesas/ra6m4-iot/ra_gen/SConscript b/bsp/renesas/ra6m4-iot/ra_gen/SConscript index c7e961c75e..9f35703f50 100644 --- a/bsp/renesas/ra6m4-iot/ra_gen/SConscript +++ b/bsp/renesas/ra6m4-iot/ra_gen/SConscript @@ -7,7 +7,7 @@ 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 in ['gcc'] : diff --git a/bsp/samd21/SConstruct b/bsp/samd21/SConstruct index 44b6fc738b..8adc9f48a0 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/stm32/libraries/templates/stm32f0xx/SConstruct b/bsp/stm32/libraries/templates/stm32f0xx/SConstruct index 277821b12c..58a2c139bc 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 50fcde0e20..ec812863ad 100644 --- a/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f0xx/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f10x/SConstruct b/bsp/stm32/libraries/templates/stm32f10x/SConstruct index e636260b5a..870efaf708 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 6447a4f5f1..ed630f8b21 100644 --- a/bsp/stm32/libraries/templates/stm32f10x/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f10x/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f2xx/SConstruct b/bsp/stm32/libraries/templates/stm32f2xx/SConstruct index 3b4403a7e4..45ad323e44 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 0e53faa663..fff36bd306 100644 --- a/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f2xx/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f3xx/SConstruct b/bsp/stm32/libraries/templates/stm32f3xx/SConstruct index dfef5be14f..18426367fc 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 ca933f3454..9fe15f4963 100644 --- a/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f3xx/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f4xx/SConstruct b/bsp/stm32/libraries/templates/stm32f4xx/SConstruct index fe44ee0b8a..cf42db1d75 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 d478107655..011f03ed86 100644 --- a/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f4xx/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f7xx/SConstruct b/bsp/stm32/libraries/templates/stm32f7xx/SConstruct index 1e20ca63a7..ada3672e5f 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 a4779a0031..7b405b2d6c 100644 --- a/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32f7xx/board/SConscript @@ -18,7 +18,7 @@ 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/stm32h7xx/SConstruct b/bsp/stm32/libraries/templates/stm32h7xx/SConstruct index fc6658ebc7..02c0e78cd2 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 13c724edf1..2ed225df9d 100644 --- a/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32h7xx/board/SConscript @@ -18,7 +18,7 @@ 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/stm32l1xx/SConstruct b/bsp/stm32/libraries/templates/stm32l1xx/SConstruct index 13ca54bdb9..593655f70f 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 61c7bee0dc..d6fad1007d 100644 --- a/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l1xx/board/SConscript @@ -25,7 +25,7 @@ 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/stm32l4xx/SConstruct b/bsp/stm32/libraries/templates/stm32l4xx/SConstruct index 57568a7bdf..8f7aa79f94 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 e1554e6a03..b4ea2eea49 100644 --- a/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l4xx/board/SConscript @@ -21,7 +21,7 @@ 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/stm32l5xx/SConstruct b/bsp/stm32/libraries/templates/stm32l5xx/SConstruct index 6d1acee40b..6a27defff6 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 dc08f2c36a..cb5f07626e 100644 --- a/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32l5xx/board/SConscript @@ -21,7 +21,7 @@ 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/stm32mp1xx/SConstruct b/bsp/stm32/libraries/templates/stm32mp1xx/SConstruct index e75b162f9d..b66fab1255 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 01d19e3442..d86a4ff7d3 100644 --- a/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32mp1xx/board/SConscript @@ -37,7 +37,7 @@ 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/stm32wbxx/SConstruct b/bsp/stm32/libraries/templates/stm32wbxx/SConstruct index 6aeca83d9f..e4b174906b 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 65341cea42..ddbdcaac36 100644 --- a/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript +++ b/bsp/stm32/libraries/templates/stm32wbxx/board/SConscript @@ -22,7 +22,7 @@ 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/stm32f072-st-nucleo/SConstruct b/bsp/stm32/stm32f072-st-nucleo/SConstruct index 1df044209c..1cd4ca59ce 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 5ce0f34884..011a73c9d8 100644 --- a/bsp/stm32/stm32f072-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f072-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f091-st-nucleo/SConstruct b/bsp/stm32/stm32f091-st-nucleo/SConstruct index 277821b12c..58a2c139bc 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 d97259d6b2..519d0cd7d7 100644 --- a/bsp/stm32/stm32f091-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f091-st-nucleo/board/SConscript @@ -22,7 +22,7 @@ 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/stm32f103-atk-nano/SConstruct b/bsp/stm32/stm32f103-atk-nano/SConstruct index e636260b5a..870efaf708 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 64ddc724b1..8b21a72b43 100644 --- a/bsp/stm32/stm32f103-atk-nano/board/SConscript +++ b/bsp/stm32/stm32f103-atk-nano/board/SConscript @@ -25,7 +25,7 @@ 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-warshipv3/SConstruct b/bsp/stm32/stm32f103-atk-warshipv3/SConstruct index e636260b5a..870efaf708 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 2fb44c4624..c7f9c448d2 100644 --- a/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript +++ b/bsp/stm32/stm32f103-atk-warshipv3/board/SConscript @@ -28,7 +28,7 @@ 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-blue-pill/SConstruct b/bsp/stm32/stm32f103-blue-pill/SConstruct index e636260b5a..870efaf708 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 6447a4f5f1..ed630f8b21 100644 --- a/bsp/stm32/stm32f103-blue-pill/board/SConscript +++ b/bsp/stm32/stm32f103-blue-pill/board/SConscript @@ -21,7 +21,7 @@ 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-M3S/SConstruct b/bsp/stm32/stm32f103-dofly-M3S/SConstruct index 541fddf58a..af8d39d821 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 98023a1479..dffd9fb8ea 100644 --- a/bsp/stm32/stm32f103-dofly-M3S/board/SConscript +++ b/bsp/stm32/stm32f103-dofly-M3S/board/SConscript @@ -31,7 +31,7 @@ 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-lyc8/SConstruct b/bsp/stm32/stm32f103-dofly-lyc8/SConstruct index 2a46bcc92c..0b03791ed0 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 6447a4f5f1..ed630f8b21 100644 --- a/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript +++ b/bsp/stm32/stm32f103-dofly-lyc8/board/SConscript @@ -21,7 +21,7 @@ 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-fire-arbitrary/SConstruct b/bsp/stm32/stm32f103-fire-arbitrary/SConstruct index e636260b5a..870efaf708 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 d20f88b2dd..f5e3fba8b0 100644 --- a/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript +++ b/bsp/stm32/stm32f103-fire-arbitrary/board/SConscript @@ -31,7 +31,7 @@ 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-gizwits-gokitv21/SConstruct b/bsp/stm32/stm32f103-gizwits-gokitv21/SConstruct index e636260b5a..870efaf708 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 6447a4f5f1..ed630f8b21 100644 --- a/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript +++ b/bsp/stm32/stm32f103-gizwits-gokitv21/board/SConscript @@ -21,7 +21,7 @@ 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-hw100k-ibox/SConstruct b/bsp/stm32/stm32f103-hw100k-ibox/SConstruct index e636260b5a..870efaf708 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 8a600659fa..490cea816a 100644 --- a/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript +++ b/bsp/stm32/stm32f103-hw100k-ibox/board/SConscript @@ -29,7 +29,7 @@ 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-onenet-nbiot/SConstruct b/bsp/stm32/stm32f103-onenet-nbiot/SConstruct index e636260b5a..870efaf708 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 680947b480..9ae5bf07fe 100644 --- a/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript +++ b/bsp/stm32/stm32f103-onenet-nbiot/board/SConscript @@ -24,7 +24,7 @@ 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-yf-ufun/SConstruct b/bsp/stm32/stm32f103-yf-ufun/SConstruct index e636260b5a..870efaf708 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 f22d467938..2610c2e3ab 100644 --- a/bsp/stm32/stm32f103-yf-ufun/board/SConscript +++ b/bsp/stm32/stm32f103-yf-ufun/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f107-uc-eval/SConstruct b/bsp/stm32/stm32f107-uc-eval/SConstruct index e636260b5a..870efaf708 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 0e43f85265..2caf5e4c6b 100644 --- a/bsp/stm32/stm32f107-uc-eval/board/SConscript +++ b/bsp/stm32/stm32f107-uc-eval/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f207-st-nucleo/SConstruct b/bsp/stm32/stm32f207-st-nucleo/SConstruct index 3b4403a7e4..45ad323e44 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 2f5eb162ca..641a6d2749 100644 --- a/bsp/stm32/stm32f207-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f207-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f302-st-nucleo/SConstruct b/bsp/stm32/stm32f302-st-nucleo/SConstruct index dfef5be14f..18426367fc 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 ca933f3454..9fe15f4963 100644 --- a/bsp/stm32/stm32f302-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f302-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f401-st-nucleo/SConstruct b/bsp/stm32/stm32f401-st-nucleo/SConstruct index fe44ee0b8a..cf42db1d75 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 723afd6874..cc99fd0774 100644 --- a/bsp/stm32/stm32f401-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f401-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f405-smdz-breadfruit/SConstruct b/bsp/stm32/stm32f405-smdz-breadfruit/SConstruct index 761a4751f2..e77a63ac80 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 b9585d1eac..268558f15f 100644 --- a/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript +++ b/bsp/stm32/stm32f405-smdz-breadfruit/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f407-armfly-v5/SConstruct b/bsp/stm32/stm32f407-armfly-v5/SConstruct index fe44ee0b8a..cf42db1d75 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 d7800961a2..a33d67953d 100644 --- a/bsp/stm32/stm32f407-armfly-v5/board/SConscript +++ b/bsp/stm32/stm32f407-armfly-v5/board/SConscript @@ -28,7 +28,7 @@ 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-atk-explorer/SConstruct b/bsp/stm32/stm32f407-atk-explorer/SConstruct index fe44ee0b8a..cf42db1d75 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 1b8bed849c..78b961dc11 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/SConscript +++ b/bsp/stm32/stm32f407-atk-explorer/board/SConscript @@ -42,7 +42,7 @@ 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-robomaster-c/SConstruct b/bsp/stm32/stm32f407-robomaster-c/SConstruct index fe44ee0b8a..cf42db1d75 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 d478107655..011f03ed86 100644 --- a/bsp/stm32/stm32f407-robomaster-c/board/SConscript +++ b/bsp/stm32/stm32f407-robomaster-c/board/SConscript @@ -21,7 +21,7 @@ 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-st-discovery/SConstruct b/bsp/stm32/stm32f407-st-discovery/SConstruct index a021b1b3e3..a1d21c0e34 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 0ee01f2b54..5efef65894 100644 --- a/bsp/stm32/stm32f407-st-discovery/board/SConscript +++ b/bsp/stm32/stm32f407-st-discovery/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f410-st-nucleo/SConstruct b/bsp/stm32/stm32f410-st-nucleo/SConstruct index a021b1b3e3..a1d21c0e34 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 44f118605c..b48c7ccd5f 100644 --- a/bsp/stm32/stm32f410-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f410-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f411-atk-nano/SConstruct b/bsp/stm32/stm32f411-atk-nano/SConstruct index fe44ee0b8a..cf42db1d75 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 4b44a0dae4..ee064b44e1 100644 --- a/bsp/stm32/stm32f411-atk-nano/board/SConscript +++ b/bsp/stm32/stm32f411-atk-nano/board/SConscript @@ -25,7 +25,7 @@ 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/SConstruct b/bsp/stm32/stm32f411-st-nucleo/SConstruct index a021b1b3e3..a1d21c0e34 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 92041cdef1..5e116aa426 100644 --- a/bsp/stm32/stm32f411-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f411-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/SConstruct b/bsp/stm32/stm32f411-weact-MiniF4/SConstruct index a021b1b3e3..a1d21c0e34 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 8864f34b50..df234f1152 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript +++ b/bsp/stm32/stm32f411-weact-MiniF4/board/SConscript @@ -22,7 +22,7 @@ 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/stm32f412-st-nucleo/SConstruct b/bsp/stm32/stm32f412-st-nucleo/SConstruct index fe44ee0b8a..cf42db1d75 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 8f2c1a39cc..9c38059432 100644 --- a/bsp/stm32/stm32f412-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f412-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f413-st-nucleo/SConstruct b/bsp/stm32/stm32f413-st-nucleo/SConstruct index fe44ee0b8a..cf42db1d75 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 3703f61373..61f69cbd13 100644 --- a/bsp/stm32/stm32f413-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f413-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f427-robomaster-a/SConstruct b/bsp/stm32/stm32f427-robomaster-a/SConstruct index fe44ee0b8a..cf42db1d75 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 1236fc9746..c4fccb1494 100644 --- a/bsp/stm32/stm32f427-robomaster-a/board/SConscript +++ b/bsp/stm32/stm32f427-robomaster-a/board/SConscript @@ -25,7 +25,7 @@ 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/stm32f429-armfly-v6/SConstruct b/bsp/stm32/stm32f429-armfly-v6/SConstruct index fe44ee0b8a..cf42db1d75 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 7b50920a19..d8c4ccafab 100644 --- a/bsp/stm32/stm32f429-armfly-v6/board/SConscript +++ b/bsp/stm32/stm32f429-armfly-v6/board/SConscript @@ -34,7 +34,7 @@ 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/SConstruct b/bsp/stm32/stm32f429-atk-apollo/SConstruct index fe44ee0b8a..cf42db1d75 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 c1c2be37fe..7e12660bd7 100644 --- a/bsp/stm32/stm32f429-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32f429-atk-apollo/board/SConscript @@ -41,7 +41,7 @@ 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/SConstruct b/bsp/stm32/stm32f429-fire-challenger/SConstruct index fe44ee0b8a..cf42db1d75 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 ada28d7c1e..a0b697822c 100644 --- a/bsp/stm32/stm32f429-fire-challenger/board/SConscript +++ b/bsp/stm32/stm32f429-fire-challenger/board/SConscript @@ -31,7 +31,7 @@ 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-st-disco/SConstruct b/bsp/stm32/stm32f429-st-disco/SConstruct index a021b1b3e3..a1d21c0e34 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 f4baeb16c9..a3218f6943 100644 --- a/bsp/stm32/stm32f429-st-disco/board/SConscript +++ b/bsp/stm32/stm32f429-st-disco/board/SConscript @@ -40,7 +40,7 @@ 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/stm32f446-st-nucleo/SConstruct b/bsp/stm32/stm32f446-st-nucleo/SConstruct index fe44ee0b8a..cf42db1d75 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 8c19775a2e..2f0551a379 100644 --- a/bsp/stm32/stm32f446-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f446-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32f469-st-disco/SConstruct b/bsp/stm32/stm32f469-st-disco/SConstruct index f401eae23b..432cff21f4 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 3b48a56d73..194948e3c3 100644 --- a/bsp/stm32/stm32f469-st-disco/board/SConscript +++ b/bsp/stm32/stm32f469-st-disco/board/SConscript @@ -34,7 +34,7 @@ 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/stm32f746-st-disco/SConstruct b/bsp/stm32/stm32f746-st-disco/SConstruct index 1e20ca63a7..ada3672e5f 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 e940a2ad37..3173f33d8d 100644 --- a/bsp/stm32/stm32f746-st-disco/board/SConscript +++ b/bsp/stm32/stm32f746-st-disco/board/SConscript @@ -28,7 +28,7 @@ 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/SConstruct b/bsp/stm32/stm32f746-st-nucleo/SConstruct index 1e20ca63a7..ada3672e5f 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 e232e885c6..a6affa9b90 100644 --- a/bsp/stm32/stm32f746-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f746-st-nucleo/board/SConscript @@ -23,7 +23,7 @@ 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/stm32f767-atk-apollo/SConstruct b/bsp/stm32/stm32f767-atk-apollo/SConstruct index 1e20ca63a7..ada3672e5f 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 4b648d8972..58644df0dd 100644 --- a/bsp/stm32/stm32f767-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32f767-atk-apollo/board/SConscript @@ -31,7 +31,7 @@ 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/SConstruct b/bsp/stm32/stm32f767-fire-challenger-v1/SConstruct index 1e20ca63a7..ada3672e5f 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 4b648d8972..58644df0dd 100644 --- a/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript +++ b/bsp/stm32/stm32f767-fire-challenger-v1/board/SConscript @@ -31,7 +31,7 @@ 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-st-nucleo/SConstruct b/bsp/stm32/stm32f767-st-nucleo/SConstruct index 1e20ca63a7..ada3672e5f 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 2d88ec6733..65fee2dbb2 100644 --- a/bsp/stm32/stm32f767-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32f767-st-nucleo/board/SConscript @@ -23,7 +23,7 @@ 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/SConstruct b/bsp/stm32/stm32f769-st-disco/SConstruct index 1e20ca63a7..ada3672e5f 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 ad30194645..3266673645 100644 --- a/bsp/stm32/stm32f769-st-disco/board/SConscript +++ b/bsp/stm32/stm32f769-st-disco/board/SConscript @@ -21,7 +21,7 @@ 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/stm32g070-st-nucleo/SConstruct b/bsp/stm32/stm32g070-st-nucleo/SConstruct index a52778f267..8d358b6e41 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 e8295f989c..b04739f709 100644 --- a/bsp/stm32/stm32g070-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g070-st-nucleo/board/SConscript @@ -22,7 +22,7 @@ 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/stm32g071-st-nucleo/SConstruct b/bsp/stm32/stm32g071-st-nucleo/SConstruct index a52778f267..8d358b6e41 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 ffeb9fb5a1..0eefb11b2b 100644 --- a/bsp/stm32/stm32g071-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g071-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32g431-st-nucleo/SConstruct b/bsp/stm32/stm32g431-st-nucleo/SConstruct index eea15e2828..b793ea3dd0 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 9ea8d79f58..0276408f8b 100644 --- a/bsp/stm32/stm32g431-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g431-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32g474-st-nucleo/SConstruct b/bsp/stm32/stm32g474-st-nucleo/SConstruct index eea15e2828..b793ea3dd0 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 8e779f0e93..349e1397ab 100644 --- a/bsp/stm32/stm32g474-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32g474-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32h743-armfly-v7/SConstruct b/bsp/stm32/stm32h743-armfly-v7/SConstruct index fc6658ebc7..02c0e78cd2 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 13c724edf1..2ed225df9d 100644 --- a/bsp/stm32/stm32h743-armfly-v7/board/SConscript +++ b/bsp/stm32/stm32h743-armfly-v7/board/SConscript @@ -18,7 +18,7 @@ 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/SConstruct b/bsp/stm32/stm32h743-atk-apollo/SConstruct index 7adb1878ab..3627dcfe83 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 d011929fcd..53187099b7 100644 --- a/bsp/stm32/stm32h743-atk-apollo/board/SConscript +++ b/bsp/stm32/stm32h743-atk-apollo/board/SConscript @@ -32,7 +32,7 @@ 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-openmv-h7plus/SConstruct b/bsp/stm32/stm32h743-openmv-h7plus/SConstruct index 7adb1878ab..3627dcfe83 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 b60f3a32f9..643c25cf87 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript +++ b/bsp/stm32/stm32h743-openmv-h7plus/board/SConscript @@ -30,7 +30,7 @@ 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-st-nucleo/SConstruct b/bsp/stm32/stm32h743-st-nucleo/SConstruct index fc6658ebc7..02c0e78cd2 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 13c724edf1..2ed225df9d 100644 --- a/bsp/stm32/stm32h743-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32h743-st-nucleo/board/SConscript @@ -18,7 +18,7 @@ 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/stm32h747-st-discovery/SConstruct b/bsp/stm32/stm32h747-st-discovery/SConstruct index fc6658ebc7..02c0e78cd2 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 8d3a51a0b8..41968a76f5 100644 --- a/bsp/stm32/stm32h747-st-discovery/board/SConscript +++ b/bsp/stm32/stm32h747-st-discovery/board/SConscript @@ -18,7 +18,7 @@ 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/stm32h750-armfly-h7-tool/SConstruct b/bsp/stm32/stm32h750-armfly-h7-tool/SConstruct index fc6658ebc7..02c0e78cd2 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 61f65bba02..84af31306e 100644 --- a/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript +++ b/bsp/stm32/stm32h750-armfly-h7-tool/board/SConscript @@ -20,7 +20,7 @@ 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-artpi/SConstruct b/bsp/stm32/stm32h750-artpi/SConstruct index fc6658ebc7..02c0e78cd2 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 66bc6359a7..cf7062c5f9 100644 --- a/bsp/stm32/stm32h750-artpi/board/SConscript +++ b/bsp/stm32/stm32h750-artpi/board/SConscript @@ -51,7 +51,7 @@ 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/stm32l010-st-nucleo/SConstruct b/bsp/stm32/stm32l010-st-nucleo/SConstruct index dd9870f2ca..60294ba65b 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 67149358a9..20b0528df0 100644 --- a/bsp/stm32/stm32l010-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l010-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/SConstruct b/bsp/stm32/stm32l053-st-nucleo/SConstruct index dd9870f2ca..60294ba65b 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 67149358a9..20b0528df0 100644 --- a/bsp/stm32/stm32l053-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l053-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32l412-st-nucleo/SConstruct b/bsp/stm32/stm32l412-st-nucleo/SConstruct index 57568a7bdf..8f7aa79f94 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 5dadc39b42..24533b99fe 100644 --- a/bsp/stm32/stm32l412-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l412-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32l431-BearPi/SConstruct b/bsp/stm32/stm32l431-BearPi/SConstruct index 57568a7bdf..8f7aa79f94 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 2f0bcd4de2..164d890cca 100644 --- a/bsp/stm32/stm32l431-BearPi/board/SConscript +++ b/bsp/stm32/stm32l431-BearPi/board/SConscript @@ -24,7 +24,7 @@ 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/stm32l432-st-nucleo/SConstruct b/bsp/stm32/stm32l432-st-nucleo/SConstruct index 57568a7bdf..8f7aa79f94 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 83a54e055e..dfd4230195 100644 --- a/bsp/stm32/stm32l432-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l432-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32l433-ali-startkit/SConstruct b/bsp/stm32/stm32l433-ali-startkit/SConstruct index 57568a7bdf..8f7aa79f94 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 7561b89cbb..d25dce9359 100644 --- a/bsp/stm32/stm32l433-ali-startkit/board/SConscript +++ b/bsp/stm32/stm32l433-ali-startkit/board/SConscript @@ -21,7 +21,7 @@ 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-st-nucleo/SConstruct b/bsp/stm32/stm32l433-st-nucleo/SConstruct index 57568a7bdf..8f7aa79f94 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 4014e1863c..48fff8f9b9 100644 --- a/bsp/stm32/stm32l433-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l433-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32l452-st-nucleo/SConstruct b/bsp/stm32/stm32l452-st-nucleo/SConstruct index 57568a7bdf..8f7aa79f94 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 527a5d0c55..b20e296b63 100644 --- a/bsp/stm32/stm32l452-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l452-st-nucleo/board/SConscript @@ -22,7 +22,7 @@ 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/stm32l475-atk-pandora/SConstruct b/bsp/stm32/stm32l475-atk-pandora/SConstruct index dcd7ae2889..4c67148536 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 854e4ee146..76d7ff6a42 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/board/SConscript @@ -46,7 +46,7 @@ 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-st-discovery/SConstruct b/bsp/stm32/stm32l475-st-discovery/SConstruct index 6aa0397a60..8bdea16505 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 fff6274835..4b994ba995 100644 --- a/bsp/stm32/stm32l475-st-discovery/board/SConscript +++ b/bsp/stm32/stm32l475-st-discovery/board/SConscript @@ -27,7 +27,7 @@ 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/stm32l476-st-nucleo/SConstruct b/bsp/stm32/stm32l476-st-nucleo/SConstruct index 57568a7bdf..8f7aa79f94 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 d48a421b32..1797056793 100644 --- a/bsp/stm32/stm32l476-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l476-st-nucleo/board/SConscript @@ -28,7 +28,7 @@ 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/stm32l496-ali-developer/SConstruct b/bsp/stm32/stm32l496-ali-developer/SConstruct index 57568a7bdf..8f7aa79f94 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 9d97bcc920..19814bd2cc 100644 --- a/bsp/stm32/stm32l496-ali-developer/board/SConscript +++ b/bsp/stm32/stm32l496-ali-developer/board/SConscript @@ -28,7 +28,7 @@ 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/SConstruct b/bsp/stm32/stm32l496-st-nucleo/SConstruct index 57568a7bdf..8f7aa79f94 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 cef1390bb6..6678edca06 100644 --- a/bsp/stm32/stm32l496-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l496-st-nucleo/board/SConscript @@ -44,7 +44,7 @@ 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/stm32l4r5-st-nucleo/SConstruct b/bsp/stm32/stm32l4r5-st-nucleo/SConstruct index b67bee1d00..5fe5df200c 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 e117729328..445c66a446 100644 --- a/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l4r5-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32l4r9-st-eval/SConstruct b/bsp/stm32/stm32l4r9-st-eval/SConstruct index 6aa0397a60..8bdea16505 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 dcfe02de57..fe4923ffda 100644 --- a/bsp/stm32/stm32l4r9-st-eval/board/SConscript +++ b/bsp/stm32/stm32l4r9-st-eval/board/SConscript @@ -32,7 +32,7 @@ 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/SConstruct b/bsp/stm32/stm32l4r9-st-sensortile-box/SConstruct index 6aa0397a60..8bdea16505 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 4a5fdaf0ef..969a0c53f1 100644 --- a/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript +++ b/bsp/stm32/stm32l4r9-st-sensortile-box/board/SConscript @@ -22,7 +22,7 @@ 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/stm32l552-st-nucleo/SConstruct b/bsp/stm32/stm32l552-st-nucleo/SConstruct index 6d1acee40b..6a27defff6 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 dc08f2c36a..cb5f07626e 100644 --- a/bsp/stm32/stm32l552-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32l552-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32mp157a-st-discovery/SConstruct b/bsp/stm32/stm32mp157a-st-discovery/SConstruct index e75b162f9d..b66fab1255 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 3460f3e0e9..46a3634f70 100644 --- a/bsp/stm32/stm32mp157a-st-discovery/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-discovery/board/SConscript @@ -90,7 +90,7 @@ 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-ev1/SConstruct b/bsp/stm32/stm32mp157a-st-ev1/SConstruct index e75b162f9d..b66fab1255 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 1262d5a546..2894a63bf5 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/SConscript +++ b/bsp/stm32/stm32mp157a-st-ev1/board/SConscript @@ -114,7 +114,7 @@ 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/stm32u575-st-nucleo/SConstruct b/bsp/stm32/stm32u575-st-nucleo/SConstruct index 5d52030247..b6f563294a 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 5404cea9fb..b6874aa2bb 100644 --- a/bsp/stm32/stm32u575-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32u575-st-nucleo/board/SConscript @@ -21,7 +21,7 @@ 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/stm32wb55-st-nucleo/SConstruct b/bsp/stm32/stm32wb55-st-nucleo/SConstruct index 6aeca83d9f..e4b174906b 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 65341cea42..ddbdcaac36 100644 --- a/bsp/stm32/stm32wb55-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32wb55-st-nucleo/board/SConscript @@ -22,7 +22,7 @@ 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/stm32wl55-st-nucleo/SConstruct b/bsp/stm32/stm32wl55-st-nucleo/SConstruct index f3769ce5b6..674a351c62 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 689b227bdf..71e017096f 100644 --- a/bsp/stm32/stm32wl55-st-nucleo/board/SConscript +++ b/bsp/stm32/stm32wl55-st-nucleo/board/SConscript @@ -22,7 +22,7 @@ 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/SConstruct b/bsp/stm32/stm32wle5-yizhilian-lm401/SConstruct index f3769ce5b6..674a351c62 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 689b227bdf..71e017096f 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm401/board/SConscript @@ -22,7 +22,7 @@ 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/SConstruct b/bsp/stm32/stm32wle5-yizhilian-lm402/SConstruct index f3769ce5b6..674a351c62 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 689b227bdf..71e017096f 100644 --- a/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript +++ b/bsp/stm32/stm32wle5-yizhilian-lm402/board/SConscript @@ -22,7 +22,7 @@ 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/swm320/SConstruct b/bsp/swm320/SConstruct index 13d83a4e1f..c1ecdb5874 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 a60cc7680b..8dce723f1b 100644 --- a/bsp/swm320/libraries/SConscript +++ b/bsp/swm320/libraries/SConscript @@ -10,7 +10,7 @@ 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/tae32f5300/Libraries/SConscript b/bsp/tae32f5300/Libraries/SConscript index e2625632cb..ae4c35e5fb 100644 --- a/bsp/tae32f5300/Libraries/SConscript +++ b/bsp/tae32f5300/Libraries/SConscript @@ -43,7 +43,7 @@ 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 473ed6fbed..19fba6cd7f 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 beaf315815..375dd998e7 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/tm4c123bsp/SConstruct b/bsp/tm4c123bsp/SConstruct index cdbe61ae64..9941169c4d 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 3534fedb29..b507558f38 100644 --- a/bsp/tm4c123bsp/board/SConscript +++ b/bsp/tm4c123bsp/board/SConscript @@ -21,7 +21,7 @@ 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/tm4c129x/libraries/SConscript b/bsp/tm4c129x/libraries/SConscript index 4e93a00bf0..3d153e9984 100644 --- a/bsp/tm4c129x/libraries/SConscript +++ b/bsp/tm4c129x/libraries/SConscript @@ -13,7 +13,7 @@ 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/upd70f3454/SConstruct b/bsp/upd70f3454/SConstruct index 6abc00e136..b2bb1fb417 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 da560dc6fb..8e9111c357 100644 --- a/bsp/upd70f3454/drivers/SConscript +++ b/bsp/upd70f3454/drivers/SConscript @@ -7,7 +7,7 @@ src_c = Glob('*.c') # add for startup script 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/w60x/SConstruct b/bsp/w60x/SConstruct index ea5f3d6439..35a7f75de0 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/wch/arm/ch32f103c8-core/SConstruct b/bsp/wch/arm/ch32f103c8-core/SConstruct index 3a3e0cb8e9..037d3b3db9 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/ch32f203r-evt/SConstruct b/bsp/wch/arm/ch32f203r-evt/SConstruct index 1827f72e77..0b8674798d 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/ch579m/SConstruct b/bsp/wch/arm/ch579m/SConstruct index 93d521a2fc..9953d55b5e 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/risc-v/ch32v103r-evt/SConstruct b/bsp/wch/risc-v/ch32v103r-evt/SConstruct index 9f4c2c13e5..e3fb5cd5d5 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 da99bf9cc8..8084ff93ff 100644 --- a/bsp/xplorer4330/Libraries/Device/SConscript +++ b/bsp/xplorer4330/Libraries/Device/SConscript @@ -16,14 +16,14 @@ if rtconfig.USE_CORE =='CORE_M4': 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 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/yichip/yc3121-pos/Libraries/SConscript b/bsp/yichip/yc3121-pos/Libraries/SConscript index 327fc2c314..76e9f6ffab 100644 --- a/bsp/yichip/yc3121-pos/Libraries/SConscript +++ b/bsp/yichip/yc3121-pos/Libraries/SConscript @@ -10,7 +10,7 @@ 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 eca0a786c8..bdbfaf94b3 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') |