Skip to content

Commit

Permalink
ARM MPS2: Cortex-M4 -> M4F & M7 -> M7FD
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
kjbracey committed Apr 12, 2019
1 parent dc1198b commit b18f2af
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions targets/targets.json
Expand Up @@ -5300,7 +5300,7 @@
},
"ARM_MPS2_M7": {
"inherits": ["ARM_MPS2_Target"],
"core": "Cortex-M7",
"core": "Cortex-M7FD",
"supported_toolchains": ["ARM"],
"extra_labels": ["ARM_SSG", "MPS2", "MPS2_M7"],
"macros": ["CMSDK_CM7"],
Expand Down Expand Up @@ -7994,13 +7994,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"]
},
Expand Down

0 comments on commit b18f2af

Please sign in to comment.