Skip to content
Permalink
Browse files

arch: arm: cleanup workaround for QEMU Cortex-M3

Qemu is already updated past 2.9 release, so this
workaround for QEMU_CORTEX_M3 is now obsolete and
can be removed.

Signed-off-by: Ioannis Glaropoulos <Ioannis.Glaropoulos@nordicsemi.no>
  • Loading branch information...
ioannisg authored and andrewboie committed Jul 17, 2019
1 parent f8c37d5 commit cbc4d41c329db4ec5e4b850cdb922fbe7c7f5504
Showing with 0 additions and 8 deletions.
  1. +0 −8 arch/arm/include/cortex_m/exc.h
@@ -68,15 +68,7 @@ static ALWAYS_INLINE bool z_IsInIsr(void)
/* If not in thread mode, and if RETTOBASE bit in ICSR is 0,
* then there are preempted active exceptions to execute.
*/
#ifndef CONFIG_BOARD_QEMU_CORTEX_M3
/* The polarity of RETTOBASE is incorrectly flipped in
* all but the very latest master tip of QEMU's NVIC driver,
* see commit "armv7m: Rewrite NVIC to not use any GIC code".
* Until QEMU 2.9 is released, and the SDK is updated to
* include it, skip this check in QEMU.
*/
|| (vector && !(SCB->ICSR & SCB_ICSR_RETTOBASE_Msk))
#endif /* CONFIG_BOARD_QEMU_CORTEX_M3 */
#else
#error Unknown ARM architecture
#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */

0 comments on commit cbc4d41

Please sign in to comment.
You can’t perform that action at this time.