Skip to content

Commit 6024d0a

Browse files
nordicjmjfischer-no
authored andcommitted
[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]> Signed-off-by: Dominik Ermel <[email protected]> (cherry picked from commit 5932630)
1 parent d9d3804 commit 6024d0a

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
@@ -1001,7 +1001,7 @@ boot_validated_swap_type(struct boot_loader_state *state,
10011001
}
10021002

10031003
#if defined(CONFIG_SOC_NRF5340_CPUAPP) && defined(PM_CPUNET_B0N_ADDRESS) \
1004-
&& !defined(CONFIG_NRF53_MULTI_IMAGE_UPDATE)
1004+
&& !defined(CONFIG_NRF53_MULTI_IMAGE_UPDATE) && defined(CONFIG_PCD_APP)
10051005
/* If the update is valid, and it targets the network core: perform the
10061006
* update and indicate to the caller of this function that no update is
10071007
* available
@@ -1029,7 +1029,8 @@ boot_validated_swap_type(struct boot_loader_state *state,
10291029
swap_type = BOOT_SWAP_TYPE_NONE;
10301030
}
10311031
}
1032-
#endif /* CONFIG_SOC_NRF5340_CPUAPP */
1032+
#endif /* CONFIG_SOC_NRF5340_CPUAPP && PM_CPUNET_B0N_ADDRESS &&
1033+
!CONFIG_NRF53_MULTI_IMAGE_UPDATE && CONFIG_PCD_APP */
10331034
}
10341035

10351036
return swap_type;

0 commit comments

Comments
 (0)