Cortex-M7 support in RT and NIL.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8115 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
343fb915c4
commit
b03ce4e2f2
|
@ -180,9 +180,11 @@ struct port_intctx {};
|
||||||
|
|
||||||
/* Includes the sub-architecture-specific part.*/
|
/* Includes the sub-architecture-specific part.*/
|
||||||
#if (CORTEX_MODEL == 0) || (CORTEX_MODEL == 1)
|
#if (CORTEX_MODEL == 0) || (CORTEX_MODEL == 1)
|
||||||
#include "nilcore_v6m.h"
|
#include "chcore_v6m.h"
|
||||||
#elif (CORTEX_MODEL == 3) || (CORTEX_MODEL == 4)
|
#elif (CORTEX_MODEL == 3) || (CORTEX_MODEL == 4) || (CORTEX_MODEL == 7)
|
||||||
#include "nilcore_v7m.h"
|
#include "chcore_v7m.h"
|
||||||
|
#else
|
||||||
|
#error "unknown Cortex-M variant"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(_FROM_ASM_)
|
#if !defined(_FROM_ASM_)
|
||||||
|
|
|
@ -157,12 +157,21 @@
|
||||||
|
|
||||||
#elif (CORTEX_MODEL == 4)
|
#elif (CORTEX_MODEL == 4)
|
||||||
#define PORT_ARCHITECTURE_ARM_v7ME
|
#define PORT_ARCHITECTURE_ARM_v7ME
|
||||||
#define PORT_ARCHITECTURE_NAME "ARMv7-ME"
|
#define PORT_ARCHITECTURE_NAME "ARMv7E-M"
|
||||||
#if CORTEX_USE_FPU
|
#if CORTEX_USE_FPU
|
||||||
#define PORT_CORE_VARIANT_NAME "Cortex-M4F"
|
#define PORT_CORE_VARIANT_NAME "Cortex-M4F"
|
||||||
#else
|
#else
|
||||||
#define PORT_CORE_VARIANT_NAME "Cortex-M4"
|
#define PORT_CORE_VARIANT_NAME "Cortex-M4"
|
||||||
#endif
|
#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
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -191,8 +191,10 @@ struct context {
|
||||||
/* Includes the sub-architecture-specific part.*/
|
/* Includes the sub-architecture-specific part.*/
|
||||||
#if (CORTEX_MODEL == 0) || (CORTEX_MODEL == 1)
|
#if (CORTEX_MODEL == 0) || (CORTEX_MODEL == 1)
|
||||||
#include "chcore_v6m.h"
|
#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"
|
#include "chcore_v7m.h"
|
||||||
|
#else
|
||||||
|
#error "unknown Cortex-M variant"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(_FROM_ASM_)
|
#if !defined(_FROM_ASM_)
|
||||||
|
|
|
@ -157,12 +157,21 @@
|
||||||
|
|
||||||
#elif (CORTEX_MODEL == 4)
|
#elif (CORTEX_MODEL == 4)
|
||||||
#define PORT_ARCHITECTURE_ARM_v7ME
|
#define PORT_ARCHITECTURE_ARM_v7ME
|
||||||
#define PORT_ARCHITECTURE_NAME "ARMv7-ME"
|
#define PORT_ARCHITECTURE_NAME "ARMv7E-M"
|
||||||
#if CORTEX_USE_FPU
|
#if CORTEX_USE_FPU
|
||||||
#define PORT_CORE_VARIANT_NAME "Cortex-M4F"
|
#define PORT_CORE_VARIANT_NAME "Cortex-M4F"
|
||||||
#else
|
#else
|
||||||
#define PORT_CORE_VARIANT_NAME "Cortex-M4"
|
#define PORT_CORE_VARIANT_NAME "Cortex-M4"
|
||||||
#endif
|
#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
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue