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

Enable uvision export for NS cores

pull/7569/head
Jimmy Brisson 2017-10-17 13:41:54 -05:00
parent 5e9ac75c4f
commit 11702d16b5
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/export/cmsis/__init__.py
View File

@ -98,6 +98,7 @@ class DeviceCMSIS():
cpu = cpu.replace("Cortex-","ARMC") cpu = cpu.replace("Cortex-","ARMC")
cpu = cpu.replace("+","P") cpu = cpu.replace("+","P")
cpu = cpu.replace("F","_FP") cpu = cpu.replace("F","_FP")
cpu = cpu.replace("-NS", "")
return cpu return cpu

10
tools/export/uvision/__init__.py
View File

@ -38,6 +38,7 @@ class DeviceUvision(DeviceCMSIS):
cpu = self.core.replace("Cortex-", "C") cpu = self.core.replace("Cortex-", "C")
cpu = cpu.replace("+", "") cpu = cpu.replace("+", "")
cpu = cpu.replace("F", "") cpu = cpu.replace("F", "")
cpu = cpu.replace("-NS", "")
cpu_flag = "p"+cpu cpu_flag = "p"+cpu
# Locations found in Keil_v5/TOOLS.INI # Locations found in Keil_v5/TOOLS.INI
@ -231,15 +232,14 @@ class Uvision(Exporter):
sct_path, dirname(sct_name)) sct_path, dirname(sct_name))
if ctx['linker_script'] != sct_path: if ctx['linker_script'] != sct_path:
self.generated_files.append(ctx['linker_script']) self.generated_files.append(ctx['linker_script'])
core = ctx['device'].core ctx['cputype'] = ctx['device'].core.rstrip("FD").replace("-NS", "")
ctx['cputype'] = core.rstrip("FD") if ctx['device'].core.endswith("FD"):
if core.endswith("FD"):
ctx['fpu_setting'] = 3 ctx['fpu_setting'] = 3
elif core.endswith("F"): elif ctx['device'].core.endswith("F"):
ctx['fpu_setting'] = 2 ctx['fpu_setting'] = 2
else: else:
ctx['fpu_setting'] = 1 ctx['fpu_setting'] = 1
ctx['fputype'] = self.format_fpu(core) ctx['fputype'] = self.format_fpu(ctx['device'].core)
ctx['armc6'] = int(self.TOOLCHAIN is 'ARMC6') ctx['armc6'] = int(self.TOOLCHAIN is 'ARMC6')
ctx['toolchain_name'] = self.TOOLCHAIN_NAME ctx['toolchain_name'] = self.TOOLCHAIN_NAME
ctx.update(self.format_flags()) ctx.update(self.format_flags())

2
tools/export/uvision/uvision.tmpl
View File

@ -217,7 +217,7 @@
<AdsLsxf>1</AdsLsxf> <AdsLsxf>1</AdsLsxf>
<RvctClst>0</RvctClst> <RvctClst>0</RvctClst>
<GenPPlst>0</GenPPlst> <GenPPlst>0</GenPPlst>
<AdsCpuType>"{{device.core.replace("D","").replace("F","")}}"</AdsCpuType> <AdsCpuType>"{{cputype}}"</AdsCpuType>
<RvctDeviceName></RvctDeviceName> <RvctDeviceName></RvctDeviceName>
<mOS>0</mOS> <mOS>0</mOS>
<uocRom>0</uocRom> <uocRom>0</uocRom>