[nrf noup] boot/zephyr: pm adaptation after macro updates

Need to rework flash area labels after upstream made them parametric macro. Signed-off-by: Andrzej Puzdrowski <[email protected]> (cherry picked from commit 1e0e56e) Signed-off-by: Martí Bolívar <[email protected]>
tejlmand · Oct 24, 2019 · 74d2f03 · 74d2f03
1 parent cfe07da
commit 74d2f03
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/boot/zephyr/include/sysflash/sysflash.h b/boot/zephyr/include/sysflash/sysflash.h
@@ -6,9 +6,9 @@
 #if USE_PARTITION_MANAGER
 #include <pm_config.h>
 
-#define FLASH_AREA_IMAGE_PRIMARY    PM_MCUBOOT_PRIMARY_ID
-#define FLASH_AREA_IMAGE_SECONDARY  PM_MCUBOOT_SECONDARY_ID
-#define FLASH_AREA_IMAGE_SCRATCH    PM_MCUBOOT_SCRATCH_ID
+#define FLASH_AREA_IMAGE_PRIMARY(x)    PM_MCUBOOT_PRIMARY_ID
+#define FLASH_AREA_IMAGE_SECONDARY(x)  PM_MCUBOOT_SECONDARY_ID
+#define FLASH_AREA_IMAGE_SCRATCH       PM_MCUBOOT_SCRATCH_ID
 
 #else