[nrf noup] loader: Fix missing PCD define check

Fixes a missing PCD define check, an image might have the network core partition layout set but if PCD support is not enabled then it should not assume that PCD support is part of mcuboot. Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 150a1d4)
voxelbotics · Jun 28, 2024 · f15d384 · f15d384
1 parent 843ee8e
commit f15d384
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
@@ -1264,7 +1264,7 @@ boot_validated_swap_type(struct boot_loader_state *state,
         }
 
 #if defined(CONFIG_SOC_NRF5340_CPUAPP) && defined(PM_CPUNET_B0N_ADDRESS) \
-    && !defined(CONFIG_NRF53_MULTI_IMAGE_UPDATE)
+    && !defined(CONFIG_NRF53_MULTI_IMAGE_UPDATE) && defined(CONFIG_PCD_APP)
         /* If the update is valid, and it targets the network core: perform the
          * update and indicate to the caller of this function that no update is
          * available
@@ -1292,7 +1292,8 @@ boot_validated_swap_type(struct boot_loader_state *state,
                 swap_type = BOOT_SWAP_TYPE_NONE;
             }
         }
-#endif /* CONFIG_SOC_NRF5340_CPUAPP */
+#endif /* CONFIG_SOC_NRF5340_CPUAPP && PM_CPUNET_B0N_ADDRESS &&
+	  !CONFIG_NRF53_MULTI_IMAGE_UPDATE && CONFIG_PCD_APP */
     }
 
     return swap_type;