From e8af66ef6f87872d3119174ef3e6c9c107aebbab Mon Sep 17 00:00:00 2001 From: Krzysztof Taborowski Date: Thu, 12 Dec 2024 12:30:15 +0100 Subject: [PATCH] samples: simplify sysbuild kconfig Replace board symbols with soc kconfigs Signed-off-by: Krzysztof Taborowski --- samples/sid_end_device/Kconfig.sysbuild | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/samples/sid_end_device/Kconfig.sysbuild b/samples/sid_end_device/Kconfig.sysbuild index 3a3e22188..0bab75986 100644 --- a/samples/sid_end_device/Kconfig.sysbuild +++ b/samples/sid_end_device/Kconfig.sysbuild @@ -4,16 +4,12 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -config NRF_DEFAULT_IPC_RADIO - default y if BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP - choice BOOTLOADER default BOOTLOADER_MCUBOOT endchoice if BOOTLOADER_MCUBOOT -# Downgrade prevention choice MCUBOOT_MODE default MCUBOOT_MODE_OVERWRITE_ONLY endchoice @@ -25,9 +21,12 @@ config DFU_MULTI_IMAGE_PACKAGE_APP default y config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY - default y if !BOARD_NRF54L15DK_NRF54L15_CPUAPP || !BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS + default y if !SOC_NRF54L15 + +if SOC_SERIES_NRF53X -if (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP) +config NRF_DEFAULT_IPC_RADIO + default y config MCUBOOT_UPDATEABLE_IMAGES default 2 @@ -48,9 +47,9 @@ config NETCORE_APP_UPDATE config DFU_MULTI_IMAGE_PACKAGE_NET default y -endif # (BOARD_NRF5340DK_NRF5340_CPUAPP || BOARD_THINGY53_NRF5340_CPUAPP) +endif # SOC_SERIES_NRF53X -if (BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || BOARD_NRF54L15DK_NRF54L10_CPUAPP) +if SOC_SERIES_NRF54LX # TODO: NCSDK-28931: Cannot use fprotect twice, so disable it in MCUboot to # test protecting factory data. It can be enabled while there is a support @@ -58,7 +57,7 @@ if (BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS || B config MCUBOOT_FPROTECT_ALLOW_COMBINED_REGIONS default n -endif # (BOARD_NRF54L15DK_NRF54L15_CPUAPP || BOARD_NRF54L15DK_NRF54L15_CPUAPP_NS) +endif # SOC_SERIES_NRF54LX endif # BOOTLOADER_MCUBOOT