From a5d0c1c00b0437dd3ad4f16fccc9863f05443cff Mon Sep 17 00:00:00 2001
From: Kevin Bracey <kevin.bracey@arm.com>
Date: Fri, 12 Apr 2019 11:28:20 +0300
Subject: [PATCH] ARM MPS2: Cortex-M4 -> M4F & M7 -> M7FD

According to their cmsis.h, FPU is present, so change targets.json to
use it.

* ARM_MPS2_M4: already was Cortex-M4F
* ARM_MPS2_M7: Cortex-M7 -> M7FD
* FVP_MPS2_M4: Cortex-M4 -> M4F
* FVP_MPS2_M7: Cortex-M7 -> M7FD

If they do not in fact have FPU, then cmsis.h should be modified to set
`__FPU_PRESENT` to 0. This will currently cause compilation problems
with ARMC6, but I'll be submitting a fix for that.
---
 targets/targets.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/targets/targets.json b/targets/targets.json
index fa8305a0e0..122d8ad47a 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -5314,7 +5314,7 @@
     },
     "ARM_MPS2_M7": {
         "inherits": ["ARM_MPS2_Target"],
-        "core": "Cortex-M7",
+        "core": "Cortex-M7FD",
         "supported_toolchains": ["ARM", "GCC_ARM", "IAR"],
         "extra_labels": ["ARM_SSG", "MPS2", "MPS2_M7"],
         "macros": ["CMSDK_CM7"],
@@ -8011,13 +8011,13 @@
     },
     "FVP_MPS2_M4": {
         "inherits": ["FVP_MPS2"],
-        "core": "Cortex-M4",
+        "core": "Cortex-M4F",
         "macros_add": ["CMSDK_CM4"],
         "device_has_add": ["MPU"]
     },
     "FVP_MPS2_M7": {
         "inherits": ["FVP_MPS2"],
-        "core": "Cortex-M7",
+        "core": "Cortex-M7FD",
         "macros_add": ["CMSDK_CM7"],
         "device_has_add": ["MPU"]
     },