diff options
| author | Marcus Shawcroft <marcus.shawcroft@arm.com> | 2016-12-31 14:41:19 +0000 |
|---|---|---|
| committer | Kumar Gala <kumar.gala@linaro.org> | 2017-01-12 09:46:25 -0600 |
| commit | 84cb997c62af43b99836daf3043894573b26782d (patch) | |
| tree | 0aed50e5d004d7b64b1707e7858b9fcd97566d39 /arch/arm/core/fault.c | |
| parent | ef8200dfcd5d86683f7ed1af0f83559099791b05 (diff) | |
arm: Adjust cortex-m7 support to reflect its ARMv7-M architecture.
The cortex-m7 is an implementation of armv7-m. Adjust the Kconfig
support for cortex-m7 to reflect this and drop the unnecessary,
explicit, conditional compilation.
Change-Id: I6ec20e69c8c83c5a80b1f714506f7f9e295b15d5
Signed-off-by: Marcus Shawcroft <marcus.shawcroft@arm.com>
Diffstat (limited to 'arch/arm/core/fault.c')
| -rw-r--r-- | arch/arm/core/fault.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/core/fault.c b/arch/arm/core/fault.c index 9586621c5..b5d60d7fb 100644 --- a/arch/arm/core/fault.c +++ b/arch/arm/core/fault.c @@ -70,7 +70,7 @@ void _FaultDump(const NANO_ESF *esf, int fault) esf->pc); #if defined(CONFIG_ARMV6_M) -#elif defined(CONFIG_ARMV7_M) || defined(CONFIG_CPU_CORTEX_M7) +#elif defined(CONFIG_ARMV7_M) int escalation = 0; if (3 == fault) { /* hard fault */ @@ -124,7 +124,7 @@ static void _FaultThreadShow(const NANO_ESF *esf) } #if defined(CONFIG_ARMV6_M) -#elif defined(CONFIG_ARMV7_M) || defined(CONFIG_CPU_CORTEX_M7) +#elif defined(CONFIG_ARMV7_M) /** * @@ -266,7 +266,7 @@ static void _HardFault(const NANO_ESF *esf) #if defined(CONFIG_ARMV6_M) _FaultThreadShow(esf); -#elif defined(CONFIG_ARMV7_M) || defined(CONFIG_CPU_CORTEX_M7) +#elif defined(CONFIG_ARMV7_M) if (_ScbHardFaultIsBusErrOnVectorRead()) { PR_EXC(" Bus fault on vector table read\n"); } else if (_ScbHardFaultIsForced()) { @@ -327,7 +327,7 @@ static void _FaultDump(const NANO_ESF *esf, int fault) _HardFault(esf); break; #if defined(CONFIG_ARMV6_M) -#elif defined(CONFIG_ARMV7_M) || defined(CONFIG_CPU_CORTEX_M7) +#elif defined(CONFIG_ARMV7_M) case 4: _MpuFault(esf, 0); break; @@ -388,7 +388,7 @@ void _Fault(const NANO_ESF *esf) void _FaultInit(void) { #if defined(CONFIG_ARMV6_M) -#elif defined(CONFIG_ARMV7_M) || defined(CONFIG_CPU_CORTEX_M7) +#elif defined(CONFIG_ARMV7_M) _ScbDivByZeroFaultEnable(); #else #error Unknown ARM architecture |