michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: Adjust cortex-m7 support to reflect its ARMv7-M architecture.

Browse source 
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>
This commit is contained in:
Marcus Shawcroft 2016-12-31 14:41:19 +00:00 • committed by Kumar Gala
commit 84cb997c62
16 changed files with 46 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/core/cpu_idle.S
View file

@ -129,7 +129,7 @@ SECTION_FUNC(TEXT, k_cpu_idle)
#if defined(CONFIG_ARMV6_M)
cpsie i
#elif defined(CONFIG_ARMV7_M) || defined(CONFIG_CPU_CORTEX_M7)
#elif defined(CONFIG_ARMV7_M)
/* clear BASEPRI so wfi is awakened by incoming interrupts */
eors.n r0, r0
msr BASEPRI, r0
@ -193,7 +193,7 @@ SECTION_FUNC(TEXT, k_cpu_atomic_idle)
cpsie i
_irq_disabled:
#elif defined(CONFIG_ARMV7_M) || defined(CONFIG_CPU_CORTEX_M7)
#elif defined(CONFIG_ARMV7_M)
/* r1: zero, for setting BASEPRI (needs a register) */
eors.n r1, r1