diff options
Diffstat (limited to 'os/rt')
| -rw-r--r-- | os/rt/ports/ARMCMx/chcore.h | 4 | ||||
| -rw-r--r-- | os/rt/ports/ARMCMx/chcore_v7m.h | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/os/rt/ports/ARMCMx/chcore.h b/os/rt/ports/ARMCMx/chcore.h index 11d14234e..d1b2dc4fb 100644 --- a/os/rt/ports/ARMCMx/chcore.h +++ b/os/rt/ports/ARMCMx/chcore.h @@ -191,8 +191,10 @@ struct context { /* Includes the sub-architecture-specific part.*/
#if (CORTEX_MODEL == 0) || (CORTEX_MODEL == 1)
#include "chcore_v6m.h"
-#elif (CORTEX_MODEL == 3) || (CORTEX_MODEL == 4)
+#elif (CORTEX_MODEL == 3) || (CORTEX_MODEL == 4) || (CORTEX_MODEL == 7)
#include "chcore_v7m.h"
+#else
+#error "unknown Cortex-M variant"
#endif
#if !defined(_FROM_ASM_)
diff --git a/os/rt/ports/ARMCMx/chcore_v7m.h b/os/rt/ports/ARMCMx/chcore_v7m.h index 37e087102..7898e4e74 100644 --- a/os/rt/ports/ARMCMx/chcore_v7m.h +++ b/os/rt/ports/ARMCMx/chcore_v7m.h @@ -157,12 +157,21 @@ #elif (CORTEX_MODEL == 4)
#define PORT_ARCHITECTURE_ARM_v7ME
-#define PORT_ARCHITECTURE_NAME "ARMv7-ME"
+#define PORT_ARCHITECTURE_NAME "ARMv7E-M"
#if CORTEX_USE_FPU
#define PORT_CORE_VARIANT_NAME "Cortex-M4F"
#else
#define PORT_CORE_VARIANT_NAME "Cortex-M4"
#endif
+
+#elif (CORTEX_MODEL == 7)
+#define PORT_ARCHITECTURE_ARM_v7ME
+#define PORT_ARCHITECTURE_NAME "ARMv7E-M"
+#if CORTEX_USE_FPU
+#define PORT_CORE_VARIANT_NAME "Cortex-M7F"
+#else
+#define PORT_CORE_VARIANT_NAME "Cortex-M7"
+#endif
#endif
/**
|