[nrf noup] Make fprotect area span only MCUBoot

nrf-squash! [nrf noup] treewide: add NCS partition manager support

This commit changes the fprotect area size definition.
This is necessary, as if TFM is used, tfm_storage is placed
between mcuboot and the application. The old implementation
led to the protected fprotect area including both
MCUBoot and tfm_storage. This was unnecessary and
in case of nRF54L15 (where the maximum FPROTECT area is small)
not being able to use FPROTECT in case TF-M was used.

Signed-off-by: Artur Hadasz <[email protected]>

Author: ahasztag

boot/zephyr/main.c

@@ -905,11 +905,15 @@ int main(void)
 
 #ifdef PM_S1_ADDRESS
 /* MCUBoot is stored in either S0 or S1, protect both */
-#define PROTECT_SIZE (PM_MCUBOOT_PRIMARY_ADDRESS - PM_S0_ADDRESS)
+#define PROTECT_SIZE (PM_S1_ADDRESS + PM_S1_SIZE - PM_S0_ADDRESS)
+#define PROTECT_ADDR PM_S0_ADDRESS
+#elif defined(PM_S0_ADDRESS)
+/* There is only one instance of MCUBoot */
+#define PROTECT_SIZE PM_S0_SIZE
 #define PROTECT_ADDR PM_S0_ADDRESS
 #else
 /* There is only one instance of MCUBoot */
-#define PROTECT_SIZE (PM_MCUBOOT_PRIMARY_ADDRESS - PM_MCUBOOT_ADDRESS)
+#define PROTECT_SIZE PM_MCUBOOT_SIZE
 #define PROTECT_ADDR PM_MCUBOOT_ADDRESS
 #endif
 

boot/zephyr/pm.yml

@@ -4,7 +4,11 @@ mcuboot:
   size: CONFIG_PM_PARTITION_SIZE_MCUBOOT
   placement:
     before: [mcuboot_primary]
+#if defined(CONFIG_FPROTECT) && !defined(CONFIG_SECURE_BOOT)
+    align: {end: CONFIG_FPROTECT_BLOCK_SIZE}
+#else
     align: {end: 0x1000}
+#endif
 
 mcuboot_primary_app:
   # All images to be placed in MCUboot's slot 0 should be placed in this