From 2a907d296d64c1b1321e56e0d32639f16e4c305c Mon Sep 17 00:00:00 2001
From: Sarah Marsh <Sarah.Marsh@arm.com>
Date: Mon, 26 Sep 2016 14:12:54 -0500
Subject: [PATCH] Fix Uvision CPU type error for DP and FPU targets.

---
 tools/export/uvision/__init__.py  | 3 ++-
 tools/export/uvision/uvision.tmpl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/export/uvision/__init__.py b/tools/export/uvision/__init__.py
index 6ef223dbe5..2bbcec9c33 100644
--- a/tools/export/uvision/__init__.py
+++ b/tools/export/uvision/__init__.py
@@ -130,7 +130,8 @@ class Uvision(Exporter):
             'device': DeviceUvision(self.target),
         }
         # 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())
         self.gen_file('uvision/uvision.tmpl', ctx, self.project_name+".uvprojx")
 
diff --git a/tools/export/uvision/uvision.tmpl b/tools/export/uvision/uvision.tmpl
index 66d1ef2064..c22f2cb491 100644
--- a/tools/export/uvision/uvision.tmpl
+++ b/tools/export/uvision/uvision.tmpl
@@ -213,7 +213,7 @@
             <AdsLsxf>1</AdsLsxf>
             <RvctClst>0</RvctClst>
             <GenPPlst>0</GenPPlst>
-            <AdsCpuType>"{{device.core}}"</AdsCpuType>
+            <AdsCpuType>"{{device.core.replace("D","").replace("F","")}}"</AdsCpuType>
             <RvctDeviceName></RvctDeviceName>
             <mOS>0</mOS>
             <uocRom>0</uocRom>