Skip to content

Commit 71ec266

Browse files
committed
[nrf noup] bootutil: 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]>
1 parent 02ae1c8 commit 71ec266

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

boot/bootutil/src/loader.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ boot_validated_swap_type(struct boot_loader_state *state,
10161016
}
10171017

10181018
#if defined(CONFIG_SOC_NRF5340_CPUAPP) && defined(PM_CPUNET_B0N_ADDRESS) \
1019-
&& !defined(CONFIG_NRF53_MULTI_IMAGE_UPDATE)
1019+
&& !defined(CONFIG_NRF53_MULTI_IMAGE_UPDATE) && defined(CONFIG_PCD_APP)
10201020
/* If the update is valid, and it targets the network core: perform the
10211021
* update and indicate to the caller of this function that no update is
10221022
* available
@@ -1072,7 +1072,8 @@ boot_validated_swap_type(struct boot_loader_state *state,
10721072
swap_type = BOOT_SWAP_TYPE_NONE;
10731073
}
10741074
}
1075-
#endif /* CONFIG_SOC_NRF5340_CPUAPP */
1075+
#endif /* CONFIG_SOC_NRF5340_CPUAPP && PM_CPUNET_B0N_ADDRESS &&
1076+
!CONFIG_NRF53_MULTI_IMAGE_UPDATE && CONFIG_PCD_APP */
10761077
}
10771078

10781079
return swap_type;

0 commit comments

Comments
 (0)