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

Fix Uvision CPU type error for DP and FPU targets.

pull/2708/head
Sarah Marsh 2016-09-26 14:12:54 -05:00
parent b1c8aac25e
commit 2a907d296d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,8 @@ class Uvision(Exporter):
'device': DeviceUvision(self.target), 'device': DeviceUvision(self.target),
} }
# Turn on FPU optimizations if the core has an FPU # Turn on FPU optimizations if the core has an FPU
ctx['fpu_setting'] = 1 if 'f' not in ctx['device'].core.lower() else 2 ctx['fpu_setting'] = 1 if 'f' not in ctx['device'].core.lower() \
or 'd' in ctx['device'].core.lower() else 2
ctx.update(self.format_flags()) ctx.update(self.format_flags())
self.gen_file('uvision/uvision.tmpl', ctx, self.project_name+".uvprojx") self.gen_file('uvision/uvision.tmpl', ctx, self.project_name+".uvprojx")

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

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