提交 c9878aac 编写于 作者: mysterywolf's avatar mysterywolf 提交者: guo

[scons][iar] 将IAR的PLATFORM字段由iar调整为iccarm

将路径更新为IAR最新版本的路径
上级 83b3aada
...@@ -83,7 +83,7 @@ elif PLATFORM == 'armcc': ...@@ -83,7 +83,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil': ...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil': ...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'D:/Keil_v5' EXEC_PATH = r'D:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -94,7 +94,7 @@ elif PLATFORM == 'armcc': ...@@ -94,7 +94,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil': ...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armclang' PLATFORM = 'armclang'
EXEC_PATH = r'D:/Keil_v5' EXEC_PATH = r'D:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -91,7 +91,7 @@ elif PLATFORM == 'armclang': ...@@ -91,7 +91,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang': ...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
POST_ACTION += 'python ./makesoc.py' POST_ACTION += 'python ./makesoc.py'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -18,7 +18,7 @@ if CROSS_TOOL == 'gcc': ...@@ -18,7 +18,7 @@ if CROSS_TOOL == 'gcc':
PLATFORM = 'gcc' PLATFORM = 'gcc'
EXEC_PATH = 'C:/work/env/tools/gnu_gcc/arm_gcc/mingw/bin' EXEC_PATH = 'C:/work/env/tools/gnu_gcc/arm_gcc/mingw/bin'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.0' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.0'
else: else:
print 'Please make sure your toolchains is GNU GCC!' print 'Please make sure your toolchains is GNU GCC!'
...@@ -67,7 +67,7 @@ if PLATFORM == 'gcc': ...@@ -67,7 +67,7 @@ if PLATFORM == 'gcc':
M_CFLAGS = CFLAGS + ' -mlong-calls -Dsourcerygxx -O0 -fPIC ' M_CFLAGS = CFLAGS + ' -mlong-calls -Dsourcerygxx -O0 -fPIC '
M_LFLAGS = DEVICE + ' -Wl,-z,max-page-size=0x4 -shared -fPIC -e main -nostdlib' M_LFLAGS = DEVICE + ' -Wl,-z,max-page-size=0x4 -shared -fPIC -e main -nostdlib'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -16,8 +16,8 @@ elif CROSS_TOOL == 'keil': ...@@ -16,8 +16,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -90,7 +90,7 @@ elif PLATFORM == 'armcc': ...@@ -90,7 +90,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output ' + TARGET_NAME + ' \n' POST_ACTION = 'fromelf --bin $TARGET --output ' + TARGET_NAME + ' \n'
POST_ACTION += 'fromelf -z $TARGET\n' POST_ACTION += 'fromelf -z $TARGET\n'
#------- IAR settings ---------------------------------------------------------- #------- IAR settings ----------------------------------------------------------
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -15,7 +15,7 @@ elif CROSS_TOOL == 'keil': ...@@ -15,7 +15,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/Keil_v5' EXEC_PATH = 'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
......
...@@ -15,7 +15,7 @@ elif CROSS_TOOL == 'keil': ...@@ -15,7 +15,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/Keil_v5' EXEC_PATH = 'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -89,7 +89,7 @@ elif PLATFORM == 'armcc': ...@@ -89,7 +89,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output ' + TARGET_NAME + ' \n' POST_ACTION = 'fromelf --bin $TARGET --output ' + TARGET_NAME + ' \n'
POST_ACTION += 'fromelf -z $TARGET\n' POST_ACTION += 'fromelf -z $TARGET\n'
#------- IAR settings ---------------------------------------------------------- #------- IAR settings ----------------------------------------------------------
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -72,7 +72,7 @@ elif PLATFORM == 'armcc': ...@@ -72,7 +72,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'armcc' CC = 'armcc'
AS = 'armasm' AS = 'armasm'
......
...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil': ...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil':
EXEC_PATH = r'C:/Keil' EXEC_PATH = r'C:/Keil'
elif CROSS_TOOL == 'iar': # not support iar yet elif CROSS_TOOL == 'iar': # not support iar yet
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/IAR' EXEC_PATH = r'C:/IAR'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -87,7 +87,7 @@ elif PLATFORM == 'armcc': ...@@ -87,7 +87,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil': ...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil':
EXEC_PATH = r'C:/Keil' EXEC_PATH = r'C:/Keil'
elif CROSS_TOOL == 'iar': # not support iar yet elif CROSS_TOOL == 'iar': # not support iar yet
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/IAR' EXEC_PATH = r'C:/IAR'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -87,7 +87,7 @@ elif PLATFORM == 'armcc': ...@@ -87,7 +87,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil': ...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil':
EXEC_PATH = r'C:/Keil' EXEC_PATH = r'C:/Keil'
elif CROSS_TOOL == 'iar': # not support iar yet elif CROSS_TOOL == 'iar': # not support iar yet
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/IAR' EXEC_PATH = r'C:/IAR'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -87,7 +87,7 @@ elif PLATFORM == 'armcc': ...@@ -87,7 +87,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang': ...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -82,7 +82,7 @@ elif PLATFORM == 'armcc': ...@@ -82,7 +82,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -18,7 +18,7 @@ elif CROSS_TOOL == 'keil': ...@@ -18,7 +18,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/Keil' EXEC_PATH = 'C:/Keil'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation' EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -79,7 +79,7 @@ elif PLATFORM == 'armcc': ...@@ -79,7 +79,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -23,7 +23,7 @@ elif CROSS_TOOL == 'keil': ...@@ -23,7 +23,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'E:/Keil' EXEC_PATH = r'E:/Keil'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:\Program Files\IAR Systems\Embedded Workbench 6.0 Evaluation' EXEC_PATH = r'C:\Program Files\IAR Systems\Embedded Workbench 6.0 Evaluation'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -84,7 +84,7 @@ elif PLATFORM == 'armcc': ...@@ -84,7 +84,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -151,7 +151,7 @@ env = Environment(tools = ['mingw'], ...@@ -151,7 +151,7 @@ env = Environment(tools = ['mingw'],
LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS) LINK = rtconfig.LINK, LINKFLAGS = rtconfig.LFLAGS)
env.PrependENVPath('PATH', rtconfig.EXEC_PATH) env.PrependENVPath('PATH', rtconfig.EXEC_PATH)
if rtconfig.PLATFORM == 'iar': if rtconfig.PLATFORM == 'iccarm':
env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES'])
env.Replace(ARFLAGS = ['']) env.Replace(ARFLAGS = [''])
env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map')
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil': ...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil': ...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil': ...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -18,8 +18,8 @@ elif CROSS_TOOL == 'keil': ...@@ -18,8 +18,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -82,7 +82,7 @@ elif PLATFORM == 'armcc': ...@@ -82,7 +82,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -18,8 +18,8 @@ elif CROSS_TOOL == 'keil': ...@@ -18,8 +18,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -82,7 +82,7 @@ elif PLATFORM == 'armcc': ...@@ -82,7 +82,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil': ...@@ -17,8 +17,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armclang' PLATFORM = 'armclang'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -87,7 +87,7 @@ elif PLATFORM == 'armclang': ...@@ -87,7 +87,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil': ...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.4' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.4'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil': ...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'D:\03_software\Program Files\Keil_v5' EXEC_PATH = r'D:\03_software\Program Files\Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'D:\03_software\Program Files\IAR Systems\Embedded Workbench 8.0' EXEC_PATH = r'D:\03_software\Program Files\IAR Systems\Embedded Workbench 8.0'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -84,7 +84,7 @@ elif PLATFORM == 'armcc': ...@@ -84,7 +84,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil': ...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'D:\03_software\Program Files\Keil_v5' EXEC_PATH = r'D:\03_software\Program Files\Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'D:\03_software\Program Files\IAR Systems\Embedded Workbench 7.5' EXEC_PATH = r'D:\03_software\Program Files\IAR Systems\Embedded Workbench 7.5'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -84,7 +84,7 @@ elif PLATFORM == 'armcc': ...@@ -84,7 +84,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -92,7 +92,7 @@ elif PLATFORM == 'armcc': ...@@ -92,7 +92,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -83,7 +83,7 @@ elif PLATFORM == 'armcc': ...@@ -83,7 +83,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -23,7 +23,7 @@ elif CROSS_TOOL == 'keil': ...@@ -23,7 +23,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:\Program Files\IAR Systems\Embedded Workbench 9.0' EXEC_PATH = r'C:\Program Files\IAR Systems\Embedded Workbench 9.0'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -101,7 +101,7 @@ elif PLATFORM == 'armcc': ...@@ -101,7 +101,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil': ...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -101,7 +101,7 @@ elif PLATFORM == 'armcc': ...@@ -101,7 +101,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil': ...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -101,7 +101,7 @@ elif PLATFORM == 'armcc': ...@@ -101,7 +101,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil': ...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -104,7 +104,7 @@ elif PLATFORM == 'armcc': ...@@ -104,7 +104,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil': ...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -101,7 +101,7 @@ elif PLATFORM == 'armcc': ...@@ -101,7 +101,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil': ...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil':
# EXEC_PATH = r'C:/Keil_v5' # EXEC_PATH = r'C:/Keil_v5'
EXEC_PATH = r'D:/Keil_v5' EXEC_PATH = r'D:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -141,7 +141,7 @@ elif PLATFORM == 'armclang': ...@@ -141,7 +141,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil': ...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil':
# EXEC_PATH = r'C:/Keil_v5' # EXEC_PATH = r'C:/Keil_v5'
EXEC_PATH = r'D:/Keil_v5' EXEC_PATH = r'D:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -106,7 +106,7 @@ elif PLATFORM == 'armcc': ...@@ -106,7 +106,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
# POST_ACTION = 'fromelf --i32combined $TARGET --output="rtthread-mdk.hex" \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --i32combined $TARGET --output="rtthread-mdk.hex" \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil': ...@@ -23,8 +23,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -104,7 +104,7 @@ elif PLATFORM == 'armcc': ...@@ -104,7 +104,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -19,8 +19,8 @@ elif CROSS_TOOL == 'keil': ...@@ -19,8 +19,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -97,7 +97,7 @@ elif PLATFORM == 'armcc': ...@@ -97,7 +97,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -19,8 +19,8 @@ elif CROSS_TOOL == 'keil': ...@@ -19,8 +19,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -99,7 +99,7 @@ elif PLATFORM == 'armcc': ...@@ -99,7 +99,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
# POST_ACTION = 'fromelf --i32combined $TARGET --output="rtthread-mdk.hex" \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --i32combined $TARGET --output="rtthread-mdk.hex" \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -15,7 +15,7 @@ elif CROSS_TOOL == 'keil': ...@@ -15,7 +15,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/Keil' EXEC_PATH = 'C:/Keil'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation' EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -24,7 +24,7 @@ elif CROSS_TOOL == 'keil': ...@@ -24,7 +24,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'D:/Keil' EXEC_PATH = r'D:/Keil'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 6.0' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 6.0'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -89,7 +89,7 @@ elif PLATFORM == 'armcc': ...@@ -89,7 +89,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -28,7 +28,7 @@ elif CROSS_TOOL == 'keil': ...@@ -28,7 +28,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'D:/Keil' EXEC_PATH = r'D:/Keil'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 6.0' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 6.0'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc': ...@@ -93,7 +93,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -16,7 +16,7 @@ elif CROSS_TOOL == 'keil': ...@@ -16,7 +16,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'D:/Keil_v5' EXEC_PATH = r'D:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc': ...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil': ...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -102,7 +102,7 @@ elif PLATFORM == 'armcc': ...@@ -102,7 +102,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil': ...@@ -22,7 +22,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -103,7 +103,7 @@ elif PLATFORM == 'armcc': ...@@ -103,7 +103,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil': ...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -102,7 +102,7 @@ elif PLATFORM == 'armcc': ...@@ -102,7 +102,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf -z $TARGET' POST_ACTION = 'fromelf -z $TARGET'
# POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' # POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -18,8 +18,8 @@ elif CROSS_TOOL == 'keil': ...@@ -18,8 +18,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/keil_v5' EXEC_PATH = 'C:/keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -13,7 +13,7 @@ if CROSS_TOOL == 'gcc': ...@@ -13,7 +13,7 @@ if CROSS_TOOL == 'gcc':
PLATFORM = 'gcc' PLATFORM = 'gcc'
EXEC_PATH = 'C:/Program Files/Renesas/Hew/Tools/KPIT Cummins/GNUM16CM32C-ELF/v11.01/m32c-elf/bin' EXEC_PATH = 'C:/Program Files/Renesas/Hew/Tools/KPIT Cummins/GNUM16CM32C-ELF/v11.01/m32c-elf/bin'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench Evaluation 6.0' EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench Evaluation 6.0'
# EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench Evaluation 6.0' # EXEC_PATH = 'C:/Program Files/IAR Systems/Embedded Workbench Evaluation 6.0'
elif CROSS_TOOL == 'keil': elif CROSS_TOOL == 'keil':
...@@ -55,7 +55,7 @@ if PLATFORM == 'gcc': ...@@ -55,7 +55,7 @@ if PLATFORM == 'gcc':
POST_ACTION = OBJCPY + ' -O srec $TARGET rtthread.mot\n' + SIZE + ' $TARGET \n' POST_ACTION = OBJCPY + ' -O srec $TARGET rtthread.mot\n' + SIZE + ' $TARGET \n'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccm16c' CC = 'iccm16c'
AS = 'am16c' AS = 'am16c'
......
...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc': ...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -25,8 +25,8 @@ elif CROSS_TOOL == 'keil': ...@@ -25,8 +25,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
......
...@@ -27,8 +27,8 @@ elif CROSS_TOOL == 'keil': ...@@ -27,8 +27,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
......
...@@ -27,8 +27,8 @@ elif CROSS_TOOL == 'keil': ...@@ -27,8 +27,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
......
...@@ -25,8 +25,8 @@ elif CROSS_TOOL == 'keil': ...@@ -25,8 +25,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
......
...@@ -92,7 +92,7 @@ elif PLATFORM == 'armcc': ...@@ -92,7 +92,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'armcc' CC = 'armcc'
AS = 'armasm' AS = 'armasm'
......
...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil': ...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/Keil_v5' EXEC_PATH = 'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc': ...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil': ...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/Keil_v5' EXEC_PATH = 'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc': ...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil': ...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/Keil_v5' EXEC_PATH = 'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc': ...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil': ...@@ -21,7 +21,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = 'C:/Keil_v5' EXEC_PATH = 'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2' EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc': ...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -30,9 +30,9 @@ elif CROSS_TOOL == 'keil': ...@@ -30,9 +30,9 @@ elif CROSS_TOOL == 'keil':
if ('EXEC_PATH' in dir()) == False: if ('EXEC_PATH' in dir()) == False:
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
if ('EXEC_PATH' in dir()) == False: if ('EXEC_PATH' in dir()) == False:
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
BUILD = 'debug' BUILD = 'debug'
...@@ -99,7 +99,7 @@ elif PLATFORM == 'armcc': ...@@ -99,7 +99,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -53,7 +53,7 @@ elif GetDepend('SOC_NRF51822') == True: ...@@ -53,7 +53,7 @@ elif GetDepend('SOC_NRF51822') == True:
if rtconfig.PLATFORM == 'gcc': if rtconfig.PLATFORM == 'gcc':
src += ['./mdk/gcc_startup_nrf51.S'] src += ['./mdk/gcc_startup_nrf51.S']
if rtconfig.PLATFORM == 'iar': if rtconfig.PLATFORM == 'iccarm':
D_SRC += ['./mdk/iar_startup_nrf51.s'] D_SRC += ['./mdk/iar_startup_nrf51.s']
``` ```
......
...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil': ...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:\Keil_v5' EXEC_PATH = r'C:\Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2' EXEC_PATH = r'C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -88,7 +88,7 @@ elif PLATFORM == 'armcc': ...@@ -88,7 +88,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil': ...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:\Keil_v5' EXEC_PATH = r'C:\Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2' EXEC_PATH = r'C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -87,7 +87,7 @@ elif PLATFORM == 'armcc': ...@@ -87,7 +87,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil': ...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armclang' PLATFORM = 'armclang'
EXEC_PATH = r'C:\Keil_v5' EXEC_PATH = r'C:\Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2' EXEC_PATH = r'C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -87,7 +87,7 @@ elif PLATFORM == 'armclang': ...@@ -87,7 +87,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil': ...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:\Keil_v5' EXEC_PATH = r'C:\Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2' EXEC_PATH = r'C:\Program Files (x86)\IAR Systems\Embedded Workbench 8.2'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
...@@ -88,7 +88,7 @@ elif PLATFORM == 'armcc': ...@@ -88,7 +88,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc': ...@@ -86,7 +86,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -24,8 +24,8 @@ elif CROSS_TOOL == 'keil': ...@@ -24,8 +24,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
......
...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil': ...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armclang' PLATFORM = 'armclang'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 8.0'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
......
...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil': ...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armclang' PLATFORM = 'armclang'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 8.0'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
......
...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil': ...@@ -20,7 +20,7 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armclang' PLATFORM = 'armclang'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files/IAR Systems/Embedded Workbench 8.0'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
......
...@@ -88,7 +88,7 @@ elif PLATFORM == 'armcc': ...@@ -88,7 +88,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
AS = 'iasmarm' AS = 'iasmarm'
......
...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc': ...@@ -81,7 +81,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --i32 $TARGET --output rtthread-sam7x.hex \nfromelf -z $TARGET' POST_ACTION = 'fromelf --i32 $TARGET --output rtthread-sam7x.hex \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'armcc' CC = 'armcc'
AS = 'armasm' AS = 'armasm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang': ...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang': ...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang': ...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang': ...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang': ...@@ -127,7 +127,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -126,7 +126,7 @@ elif PLATFORM == 'armclang': ...@@ -126,7 +126,7 @@ elif PLATFORM == 'armclang':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil': ...@@ -22,8 +22,8 @@ elif CROSS_TOOL == 'keil':
PLATFORM = 'armcc' PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5' EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar': elif CROSS_TOOL == 'iar':
PLATFORM = 'iar' PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0' EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'
if os.getenv('RTT_EXEC_PATH'): if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH') EXEC_PATH = os.getenv('RTT_EXEC_PATH')
...@@ -94,7 +94,7 @@ elif PLATFORM == 'armcc': ...@@ -94,7 +94,7 @@ elif PLATFORM == 'armcc':
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET' POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
elif PLATFORM == 'iar': elif PLATFORM == 'iccarm':
# toolchains # toolchains
CC = 'iccarm' CC = 'iccarm'
CXX = 'iccarm' CXX = 'iccarm'
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册