Skip to content

Commit ed8c353

Browse files
nordicjmbjarki-andreasen
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]> (cherry picked from commit 150a1d4)
1 parent 8bbfb6c commit ed8c353

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
@@ -1316,7 +1316,7 @@ boot_validated_swap_type(struct boot_loader_state *state,
13161316
}
13171317

13181318
#if defined(CONFIG_SOC_NRF5340_CPUAPP) && defined(PM_CPUNET_B0N_ADDRESS) \
1319-
&& !defined(CONFIG_NRF53_MULTI_IMAGE_UPDATE)
1319+
&& !defined(CONFIG_NRF53_MULTI_IMAGE_UPDATE) && defined(CONFIG_PCD_APP)
13201320
/* If the update is valid, and it targets the network core: perform the
13211321
* update and indicate to the caller of this function that no update is
13221322
* available
@@ -1344,7 +1344,8 @@ boot_validated_swap_type(struct boot_loader_state *state,
13441344
swap_type = BOOT_SWAP_TYPE_NONE;
13451345
}
13461346
}
1347-
#endif /* CONFIG_SOC_NRF5340_CPUAPP */
1347+
#endif /* CONFIG_SOC_NRF5340_CPUAPP && PM_CPUNET_B0N_ADDRESS &&
1348+
!CONFIG_NRF53_MULTI_IMAGE_UPDATE && CONFIG_PCD_APP */
13481349
}
13491350

13501351
return swap_type;

0 commit comments

Comments
 (0)