Skip to content

Commit 419f751

Browse files
committed
[nrf noup] boot: bootutil: loader: skip netcore check with QSPI XIP split
Do not define INCLUDE_NETWORK_CORE_IMAGE_CHECK when QSPI XIP split images is enabled. Reaseon is that MCUBOOT_CHECK_HEADER_LOAD_ADDRESS feature can not be used along with qspi external xip. Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
1 parent 55336ab commit 419f751

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

boot/bootutil/src/loader.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,11 @@ boot_rom_address_check(struct boot_loader_state *state)
617617
}
618618
#endif
619619

620+
/* Netcore slot checks in loader.c are not used with QSPI XIP split images
621+
* (see MCUBOOT_QSPI_XIP_IMAGE_NUMBER / MCUBOOT_CHECK_HEADER_LOAD_ADDRESS).
622+
*/
620623
#if (CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1) && !defined(CONFIG_NRF53_MULTI_IMAGE_UPDATE) \
621-
&& defined(CONFIG_PCD_APP)
624+
&& defined(CONFIG_PCD_APP) && (CONFIG_MCUBOOT_QSPI_XIP_IMAGE_NUMBER < 0)
622625
#define INCLUDE_NETWORK_CORE_IMAGE_CHECK
623626
#endif
624627

0 commit comments

Comments
 (0)