Skip to content

Commit

Permalink
[nrf noup] bootloader: mcuboot: Fix wrong use of if defined
Browse files Browse the repository at this point in the history
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 <ole.saether@nordicsemi.no>
(cherry picked from commit 823fd36)
  • Loading branch information
osaether authored and cvinayak committed Oct 19, 2023
1 parent 685c58e commit 09bad48
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions boot/zephyr/nrf_cleanup.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <string.h>

#if defined(USE_PARTITION_MANAGER)
#if USE_PARTITION_MANAGER
#include <pm_config.h>
#endif

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 09bad48

Please sign in to comment.