From 823fd369c1430b50d263ccd6fbcf98bdd44001ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole=20S=C3=A6ther?= Date: Tue, 20 Jun 2023 08:30:25 +0200 Subject: [PATCH] [nrf noup] bootloader: mcuboot: Fix wrong use of if defined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The file nrf_cleanup.c has "#if defined(USE_PARTITION_MANAGER)" Which is true even if USE_PARTITION_MANAGER=n. This must be changed to "#if USE_PARTITION_MANAGER" for correct behaviour. Ref: NCSIDB-987 Signed-off-by: Ole Sæther --- boot/zephyr/nrf_cleanup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/zephyr/nrf_cleanup.c b/boot/zephyr/nrf_cleanup.c index f567b97e0..2165159ea 100644 --- a/boot/zephyr/nrf_cleanup.c +++ b/boot/zephyr/nrf_cleanup.c @@ -20,7 +20,7 @@ #include -#if defined(USE_PARTITION_MANAGER) +#if USE_PARTITION_MANAGER #include #endif @@ -86,7 +86,7 @@ void nrf_cleanup_peripheral(void) nrf_cleanup_clock(); } -#if defined(USE_PARTITION_MANAGER) \ +#if USE_PARTITION_MANAGER \ && defined(CONFIG_ARM_TRUSTZONE_M) \ && defined(PM_SRAM_NONSECURE_NAME) void nrf_cleanup_ns_ram(void)