ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3355 from sarahmarshy/iar-no-cmsis 

IAR export will not fail in the absence of a CMSIS pack
pull/3415/head
Martin Kojtal 2016-12-09 15:33:33 +01:00 committed by GitHub
parent 89b56d6b3d ab23c00b08
commit 8f138fc27b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/export/iar/__init__.py
View File

@ -7,7 +7,7 @@ import re
import sys import sys
from tools.targets import TARGET_MAP from tools.targets import TARGET_MAP
from tools.export.exporters import Exporter from tools.export.exporters import Exporter, TargetNotSupportedException
import json import json
from tools.export.cmsis import DeviceCMSIS from tools.export.cmsis import DeviceCMSIS
from multiprocessing import cpu_count from multiprocessing import cpu_count
@ -29,8 +29,7 @@ class IAR(Exporter):
#iar_definitions.json #iar_definitions.json
TARGETS = [target for target, obj in TARGET_MAP.iteritems() TARGETS = [target for target, obj in TARGET_MAP.iteritems()
if hasattr(obj, 'device_name') and if hasattr(obj, 'device_name') and
obj.device_name in IAR_DEFS.keys() and "IAR" in obj.supported_toolchains obj.device_name in IAR_DEFS.keys() and "IAR" in obj.supported_toolchains]
and DeviceCMSIS.check_supported(target)]
SPECIAL_TEMPLATES = { SPECIAL_TEMPLATES = {
'rz_a1h' : 'iar/iar_rz_a1h.ewp.tmpl', 'rz_a1h' : 'iar/iar_rz_a1h.ewp.tmpl',
@ -106,6 +105,12 @@ class IAR(Exporter):
#Optimizations #Optimizations
if '-Oh' in flags['c_flags']: if '-Oh' in flags['c_flags']:
flags['c_flags'].remove('-Oh') flags['c_flags'].remove('-Oh')
try:
debugger = DeviceCMSIS(self.target).debug.replace('-','').upper()
except TargetNotSupportedException:
debugger = "CMSISDAP"
ctx = { ctx = {
'name': self.project_name, 'name': self.project_name,
'groups': self.iar_groups(self.format_src(srcs)), 'groups': self.iar_groups(self.format_src(srcs)),
@ -113,7 +118,7 @@ class IAR(Exporter):
'include_paths': [self.format_file(src) for src in self.resources.inc_dirs], 'include_paths': [self.format_file(src) for src in self.resources.inc_dirs],
'device': self.iar_device(), 'device': self.iar_device(),
'ewp': sep+self.project_name + ".ewp", 'ewp': sep+self.project_name + ".ewp",
'debugger': DeviceCMSIS(self.target).debug.replace('-','').upper() 'debugger': debugger
} }
ctx.update(flags) ctx.update(flags)