commit a88e229346204c09b6292f49e4481627254946e7
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Thu Dec 07 09:40:51 2023 +0000
committer Jamie <40387179+nordicjm@users.noreply.github.com> Thu Dec 07 10:43:58 2023 +0000
tree c5a727513df3cdd074c04e0447691fb138097624
parent 2a74a2b580035e767f4a4ead2b7c8b9253872276

zephyr: sysflash: Fix if condition for zephyr applications

Fixes an issue when sysflash is included by zephyr (non-mcuboot)
applications

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boot/zephyr/include/sysflash/sysflash.h

diff --git a/boot/zephyr/include/sysflash/sysflash.h b/boot/zephyr/include/sysflash/sysflash.h
index 646f112..890e69d 100644
--- a/boot/zephyr/include/sysflash/sysflash.h
+++ b/boot/zephyr/include/sysflash/sysflash.h
@@ -12,7 +12,7 @@
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/sys/util_macro.h>
 
-#ifndef CONFIG_SINGLE_APPLICATION_SLOT
+#if !defined(CONFIG_SINGLE_APPLICATION_SLOT) && !defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP)
 
 /* Each pair of slots is separated by , and there is no terminating character */
 #define FLASH_AREA_IMAGE_0_SLOTS    slot0_partition, slot1_partition
@@ -50,7 +50,7 @@
 #define FLASH_AREA_IMAGE_SCRATCH    FIXED_PARTITION_ID(scratch_partition)
 #endif
 
-#else /* CONFIG_SINGLE_APPLICATION_SLOT */
+#else /* !CONFIG_SINGLE_APPLICATION_SLOT && !CONFIG_MCUBOOT_BOOTLOADER_MODE_SINGLE_APP */
 
 #define FLASH_AREA_IMAGE_PRIMARY(x)	FIXED_PARTITION_ID(slot0_partition)
 #define FLASH_AREA_IMAGE_SECONDARY(x)	FIXED_PARTITION_ID(slot0_partition)