Commit d465ab5f authored Aug 20, 2021 by Sigvart Hovland Committed by Andrzej Puzdrowski Sep 08, 2021

boot: zephyr: Fix misaligned #else for `irq_lock`



So in PR #1089 I misaligned the `#else` used for the `irq_lock` as it
should be aligned with `CONFIG_MCUBOOT_CLEANUP_ARM_CORE`. So that
`irq_lock`is called when we don't call `__disable_irq` from arm core
clean up code.

Signed-off-by: Sigvart Hovland <sigvart.hovland@nordicsemi.no>
(cherry picked from commit 9647c465)
Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

parent 8b668c15

boot/zephyr/main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -201,8 +201,6 @@ static void do_boot(struct boot_rsp *rsp)

		#if CONFIG_CPU_HAS_ARM_MPU \|\| CONFIG_CPU_HAS_NXP_MPU
		z_arm_clear_arm_mpu_config();
		#else
		irq_lock();
		#endif

		#if defined(CONFIG_BUILTIN_STACK_GUARD) && \
		@@ -214,6 +212,8 @@ static void do_boot(struct boot_rsp *rsp)
		__set_MSPLIM(0);
		#endif

		#else
		irq_lock();
		#endif /* CONFIG_MCUBOOT_CLEANUP_ARM_CORE */

		#ifdef CONFIG_BOOT_INTR_VEC_RELOC

Admin message