Skip to content

Commit b18f2af

Browse files
committed
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.
1 parent dc1198b commit b18f2af

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

targets/targets.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5300,7 +5300,7 @@
53005300
},
53015301
"ARM_MPS2_M7": {
53025302
"inherits": ["ARM_MPS2_Target"],
5303-
"core": "Cortex-M7",
5303+
"core": "Cortex-M7FD",
53045304
"supported_toolchains": ["ARM"],
53055305
"extra_labels": ["ARM_SSG", "MPS2", "MPS2_M7"],
53065306
"macros": ["CMSDK_CM7"],
@@ -7994,13 +7994,13 @@
79947994
},
79957995
"FVP_MPS2_M4": {
79967996
"inherits": ["FVP_MPS2"],
7997-
"core": "Cortex-M4",
7997+
"core": "Cortex-M4F",
79987998
"macros_add": ["CMSDK_CM4"],
79997999
"device_has_add": ["MPU"]
80008000
},
80018001
"FVP_MPS2_M7": {
80028002
"inherits": ["FVP_MPS2"],
8003-
"core": "Cortex-M7",
8003+
"core": "Cortex-M7FD",
80048004
"macros_add": ["CMSDK_CM7"],
80058005
"device_has_add": ["MPU"]
80068006
},

0 commit comments

Comments
 (0)