Skip to content

solve conflict #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mysterywolf merged 19 commits into from
Jun 10, 2022
Merged

solve conflict #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f5c88ad
Fix compiler warnings (#6023)
enkiller Jun 7, 2022
21003c7
[bsp][stm32] 增加uart7和uart8的DMA配置
BreederBai Jun 7, 2022
4b26e44
[bsp][stm32h750-artpi] add bootloader.bin, add the description of the…
Yanlineng Jun 6, 2022
a9dce72
[bsp][stm32h750-artpi] Modify the content of flash algorithms in READ…
Yanlineng Jun 6, 2022
37d0be3
[libc][time] solve the problem which the os tick can be calculated wr…
fortunerains Jun 1, 2022
99a1c36
attach: remove strnlen #6026
mysterywolf Jun 5, 2022
5b84857
[bsp][stm32] fix stm32f767-st-nucleo console device name
luhuadong Jun 6, 2022
4fa1beb
[bsp][100ask]: create two new bsp for 100ask stm32f103 boards and com…
100ask-alen Jun 8, 2022
e622ef3
添加USART1/2/3的管脚配置操作 (#6039)
xiaoxiaolisunny Jun 8, 2022
50f041f
[Scons] 将GCC判断条件改为列表方式，方便后续增加新的编译工具链
mysterywolf May 30, 2022
83b3aad
[Scons][iar][iccarm] IAR统一使用iccarm作为判断条件而不是是用IDE的名字来进行判断
mysterywolf May 30, 2022
c9878aa
[scons][iar] 将IAR的PLATFORM字段由iar调整为iccarm
mysterywolf May 30, 2022
a738849
添加HC32F460系列CAN设备驱动支持
xiaoxiaolisunny Jun 8, 2022
3151d01
修改USART2_RX_PIN
xiaoxiaolisunny Jun 8, 2022
8b60b58
[bsp][rockchip][rk2108]: add rk2108 base support. (#6040)
Jun 9, 2022
5e0810e
[bsp][stm32l496zg] add on-chip feature (#6056)
supperthomas Jun 9, 2022
138925b
修复多串口的描述符被覆盖的问题 (#6051)
ueJone Jun 9, 2022
7824c54
[docs] add nrfx docs
chenyingchun0312 Jun 9, 2022
f6ce2eb
[.gitignore] add source insight projects in .gitignore
chenyingchun0312 Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/workflows/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ jobs:
- {RTT_BSP: "sam7x", RTT_TOOL_CHAIN: "sourcery-arm"}
- {RTT_BSP: "stm32/stm32f072-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
- {RTT_BSP: "stm32/stm32f091-st-nucleo", RTT_TOOL_CHAIN: "sourcery-arm"}
- {RTT_BSP: "stm32/stm32f103_100ask_mini", RTT_TOOL_CHAIN: "sourcery-arm"}
- {RTT_BSP: "stm32/stm32f103_100ask_pro", RTT_TOOL_CHAIN: "sourcery-arm"}
- {RTT_BSP: "stm32/stm32f103-atk-nano", RTT_TOOL_CHAIN: "sourcery-arm"}
- {RTT_BSP: "stm32/stm32f103-atk-warshipv3", RTT_TOOL_CHAIN: "sourcery-arm"}
- {RTT_BSP: "stm32/stm32f103-blue-pill", RTT_TOOL_CHAIN: "sourcery-arm"}
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ documentation/html
*.a
*.i
*.d
#source insight 4 project files
*.si4project
tools/kconfig-frontends/kconfig-mconf
packages
dist
Expand Down
4 changes: 2 additions & 2 deletions bsp/CME_M7/CMSIS/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ CME_M7/system_cmem7.c
""")

# add for startup script
if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
src += ['CME_M7/startup/gcc/startup_CME_M7.c']
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
src += ['CME_M7/startup/arm/startup_cmem7.s']
elif rtconfig.CROSS_TOOL == 'iar':
elif rtconfig.PLATFORM in ['iccarm']:
print('================ERROR============================')
print('Not support IAR yet!')
print('=================================================')
Expand Down
2 changes: 1 addition & 1 deletion bsp/CME_M7/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
2 changes: 1 addition & 1 deletion bsp/CME_M7/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'

elif PLATFORM == 'iar':
elif PLATFORM == 'iccarm':
# toolchains
CC = 'iccarm'
AS = 'iasmarm'
Expand Down
2 changes: 1 addition & 1 deletion bsp/Vango/v85xx/Libraries/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ src += [cwd + '/CMSIS/Vango/V85xx/Source/lib_cortex.c']
src += [cwd + '/CMSIS/Vango/V85xx/Source/lib_LoadNVR.c']

#add for startup script
if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
src += [cwd + '/CMSIS/Vango/V85xx/Source/GCC/startup_target.S']
if rtconfig.PLATFORM in ['armcc', 'armclang']:
src += [cwd + '/CMSIS/Vango/V85xx/Source/Keil5/startup_target.S']
Expand Down
2 changes: 1 addition & 1 deletion bsp/Vango/v85xx/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions bsp/Vango/v85xx/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar':
PLATFORM = 'iar'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'

if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
Expand Down Expand Up @@ -81,7 +81,7 @@

POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'

elif PLATFORM == 'iar':
elif PLATFORM == 'iccarm':
# toolchains
CC = 'iccarm'
AS = 'iasmarm'
Expand Down
2 changes: 1 addition & 1 deletion bsp/Vango/v85xxp/Libraries/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ src += [cwd + '/CMSIS/Vango/V85xxP/Source/lib_cortex.c']
src += [cwd + '/CMSIS/Vango/V85xxP/Source/lib_LoadNVR.c']

#add for startup script
if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
src += [cwd + '/CMSIS/Vango/V85xxP/Source/GCC/startup_target.S']
if rtconfig.PLATFORM in ['armcc', 'armclang']:
src += [cwd + '/CMSIS/Vango/V85xxP/Source/Keil5/startup_target.S']
Expand Down
2 changes: 1 addition & 1 deletion bsp/Vango/v85xxp/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions bsp/Vango/v85xxp/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar':
PLATFORM = 'iar'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'

if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
Expand Down Expand Up @@ -81,7 +81,7 @@

POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'

elif PLATFORM == 'iar':
elif PLATFORM == 'iccarm':
# toolchains
CC = 'iccarm'
AS = 'iasmarm'
Expand Down
2 changes: 1 addition & 1 deletion bsp/acm32/acm32f0x0-nucleo/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions bsp/acm32/acm32f0x0-nucleo/libraries/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ HAL_Driver/Src/HAL_CRC.c
libpath = ['.', cwd + '/Device', cwd + '/HAL_Driver/Src']
libs = []

if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
src = src + ['Device/Startup_ACM32F0x0_gcc.s']
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
src = src + ['Device/Startup_ACM32F0x0.s']
elif rtconfig.CROSS_TOOL == 'iar':
elif rtconfig.PLATFORM in ['iccarm']:
src = src + ['Device/Startup_ACM32F0x0_iar.s']

path = [cwd + '/HAL_Driver/Inc',
Expand Down
6 changes: 3 additions & 3 deletions bsp/acm32/acm32f0x0-nucleo/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
PLATFORM = 'armcc'
EXEC_PATH = r'D:/Keil_v5'
elif CROSS_TOOL == 'iar':
PLATFORM = 'iar'
EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2'
PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'

if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
Expand Down Expand Up @@ -94,7 +94,7 @@

POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'

elif PLATFORM == 'iar':
elif PLATFORM == 'iccarm':
# toolchains
CC = 'iccarm'
CXX = 'iccarm'
Expand Down
2 changes: 1 addition & 1 deletion bsp/acm32/acm32f4xx-nucleo/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
4 changes: 2 additions & 2 deletions bsp/acm32/acm32f4xx-nucleo/libraries/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ HAL_Driver/Src/HAL_EXTI.c
libpath = ['.', cwd + '/Device', cwd + '/HAL_Driver/Src']
libs = ['System_Accelerate', 'HAL_EFlash_EX']

if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
src += ['Device/Startup_ACM32F4_gcc.s']
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
src += ['Device/Startup_ACM32F4.s']
elif rtconfig.CROSS_TOOL == 'iar':
elif rtconfig.PLATFORM in ['iccarm']:
src += ['Device/Startup_ACM32F4_iar.s']

path = [cwd + '/HAL_Driver/Inc',
Expand Down
6 changes: 3 additions & 3 deletions bsp/acm32/acm32f4xx-nucleo/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
PLATFORM = 'armclang'
EXEC_PATH = r'D:/Keil_v5'
elif CROSS_TOOL == 'iar':
PLATFORM = 'iar'
EXEC_PATH = r'D:/Program Files (x86)/IAR Systems/Embedded Workbench 8.2'
PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'

if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
Expand Down Expand Up @@ -91,7 +91,7 @@

POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'

elif PLATFORM == 'iar':
elif PLATFORM == 'iccarm':
# toolchains
CC = 'iccarm'
CXX = 'iccarm'
Expand Down
2 changes: 1 addition & 1 deletion bsp/airm2m/air105/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions bsp/airm2m/air105/board/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ path = [cwd]

startup_path_prefix = SDK_LIB

if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
src += [startup_path_prefix + '/HAL_Driver/Startup/gcc/startup_gcc.s']
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
src += [startup_path_prefix + '/HAL_Driver/Startup/arm/startup_gcc.s']
elif rtconfig.CROSS_TOOL == 'iar':
elif rtconfig.PLATFORM in ['iccarm']:
src += [startup_path_prefix + '/HAL_Driver/Startup/iar/startup_gcc.s']

group = DefineGroup('Drivers', src, depend = [''], CPPPATH = path, CPPDEFINES = CPPDEFINES)
Expand Down
6 changes: 3 additions & 3 deletions bsp/airm2m/air105/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar':
PLATFORM = 'iar'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'

if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
Expand Down Expand Up @@ -127,7 +127,7 @@

POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
POST_ACTION += 'python ./makesoc.py'
elif PLATFORM == 'iar':
elif PLATFORM == 'iccarm':
# toolchains
CC = 'iccarm'
CXX = 'iccarm'
Expand Down
2 changes: 1 addition & 1 deletion bsp/allwinner_tina/libcpu/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cwd = GetCurrentDir()
src = Glob('*.c')
CPPPATH = [cwd]

if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
src += Glob('*_gcc.S')

group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH)
Expand Down
2 changes: 1 addition & 1 deletion bsp/amebaz/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions bsp/amebaz/libraries/smartconfig/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ path = [cwd + '/inc']
libs = ['']
libpath = [cwd + '/libs']

if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
libs += ['libsmartconfig_armcm4_gcc']
elif rtconfig.CROSS_TOOL == 'iar':
elif rtconfig.PLATFORM in ['iccarm']:
libs += ['libsmartconfig_armcm4_iar']

group = DefineGroup('Libraries', src, depend = ['RT_USING_SMARTCONFIG_LIB'], CPPPATH = path, LIBS = libs, LIBPATH = libpath)
Expand Down
4 changes: 2 additions & 2 deletions bsp/amebaz/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
PLATFORM = 'gcc'
EXEC_PATH = 'C:/work/env/tools/gnu_gcc/arm_gcc/mingw/bin'
elif CROSS_TOOL == 'iar':
PLATFORM = 'iar'
PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.0'
else:
print 'Please make sure your toolchains is GNU GCC!'
Expand Down Expand Up @@ -67,7 +67,7 @@
M_CFLAGS = CFLAGS + ' -mlong-calls -Dsourcerygxx -O0 -fPIC '
M_LFLAGS = DEVICE + ' -Wl,-z,max-page-size=0x4 -shared -fPIC -e main -nostdlib'

elif PLATFORM == 'iar':
elif PLATFORM == 'iccarm':
# toolchains
CC = 'iccarm'
AS = 'iasmarm'
Expand Down
2 changes: 1 addition & 1 deletion bsp/apm32/apm32f103xe-minibroard/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions bsp/apm32/apm32f103xe-minibroard/board/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ startup_path_prefix = SDK_LIB
if rtconfig.PLATFORM in ['armcc', 'armclang']:
src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/arm/startup_apm32f10x_hd.s']

if rtconfig.CROSS_TOOL == 'iar':
if rtconfig.PLATFORM in ['iccarm']:
src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/iar/startup_apm32f10x_hd.s']

if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
src += [startup_path_prefix + '/APM32F10x_Library/Device/Geehy/APM32F10x/Source/gcc/startup_apm32f10x_hd.s']

# You can select chips from the list above
Expand Down
6 changes: 3 additions & 3 deletions bsp/apm32/apm32f103xe-minibroard/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar':
PLATFORM = 'iar'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
PLATFORM = 'iccarm'
EXEC_PATH = r'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'

if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
Expand Down Expand Up @@ -93,7 +93,7 @@

POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'

elif PLATFORM == 'iar':
elif PLATFORM == 'iccarm':
# toolchains
CC = 'iccarm'
CXX = 'iccarm'
Expand Down
2 changes: 1 addition & 1 deletion bsp/apollo2/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
4 changes: 2 additions & 2 deletions bsp/apollo2/libraries/startup/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ src = Split("""
""")

# add for startup script
if rtconfig.PLATFORM == 'gcc':
if rtconfig.PLATFORM in ['gcc']:
src = src + ['gcc/' + 'startup_gcc.c']
elif rtconfig.PLATFORM in ['armcc', 'armclang']:
src = src + ['arm/' + 'startup_keil.s']
elif rtconfig.CROSS_TOOL == 'iar':
elif rtconfig.PLATFORM in ['iccarm']:
src = src + ['iar/' + 'startup_iar.c']

path = [cwd]
Expand Down
6 changes: 3 additions & 3 deletions bsp/asm9260t/rtconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
PLATFORM = 'armcc'
EXEC_PATH = r'C:/Keil_v5'
elif CROSS_TOOL == 'iar':
PLATFORM = 'iar'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
PLATFORM = 'iccarm'
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.3'

if os.getenv('RTT_EXEC_PATH'):
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
Expand Down Expand Up @@ -90,7 +90,7 @@
POST_ACTION = 'fromelf --bin $TARGET --output ' + TARGET_NAME + ' \n'
POST_ACTION += 'fromelf -z $TARGET\n'
#------- IAR settings ----------------------------------------------------------
elif PLATFORM == 'iar':
elif PLATFORM == 'iccarm':
# toolchains
CC = 'iccarm'
AS = 'iasmarm'
Expand Down
2 changes: 1 addition & 1 deletion bsp/at32/at32f403a-start/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Loading