From 9360c894dd5bfef5260504e9a6cd3fb656b8fc00 Mon Sep 17 00:00:00 2001 From: Marek Pieta Date: Fri, 17 May 2024 13:01:32 +0200 Subject: [PATCH] applications: nrf_desktop: Integrate APPLICATION_CONFIG_DIR for sysbuild Change integrates APPLICATION_CONFIG_DIR for sysbuild. Change also fixes a few configuration issues observed while testing locally. Jira: NCSDK-24857 Signed-off-by: Marek Pieta --- applications/nrf_desktop/Kconfig.sysbuild | 29 -------- applications/nrf_desktop/SysbuildLists.txt | 12 ++++ .../mcuboot/{prj.conf => prj_release.conf} | 0 .../sysbuild_release.conf | 9 +++ .../mcuboot/{prj.conf => prj_release.conf} | 0 .../nrf52833dk_nrf52820/sysbuild_release.conf | 9 +++ .../nrf52833dk_nrf52833/sysbuild.conf | 9 +++ .../nrf52833dk_nrf52833/sysbuild_release.conf | 9 +++ .../nrf52833dongle_nrf52833/sysbuild.conf | 9 +++ .../sysbuild_release.conf | 9 +++ .../nrf52840dk_nrf52840/sysbuild.conf | 10 +++ .../nrf52840dk_nrf52840/sysbuild_dongle.conf | 10 +++ .../sysbuild_fast_pair.conf | 10 +++ .../sysbuild_keyboard.conf | 10 +++ .../sysbuild_mcuboot_qspi.conf | 9 +++ .../sysbuild_mcuboot_smp.conf | 8 +++ .../nrf52840dk_nrf52840/sysbuild_release.conf | 10 +++ .../nrf52840dk_nrf52840/sysbuild_wwcb.conf | 10 +++ .../nrf52840dongle_nrf52840/sysbuild.conf | 10 +++ .../sysbuild_3bleconn.conf | 10 +++ .../sysbuild_4llpmconn.conf | 10 +++ .../sysbuild_release.conf | 10 +++ .../sysbuild_release_4llpmconn.conf | 10 +++ .../nrf52840gmouse_nrf52840/sysbuild.conf | 10 +++ .../sysbuild_fast_pair.conf | 10 +++ .../sysbuild_mcuboot_smp.conf | 8 +++ .../sysbuild_release.conf | 10 +++ .../sysbuild_release_fast_pair.conf | 10 +++ .../nrf52kbd_nrf52832/sysbuild_release.conf | 10 +++ .../sysbuild_release_fast_pair.conf | 10 +++ .../nrf5340dk_nrf5340_cpuapp/sysbuild.conf | 11 +++ .../sysbuild_release.conf | 11 +++ .../nrf54l15pdk_nrf54l15_cpuapp/sysbuild.conf | 9 +++ .../sysbuild_keyboard.conf | 9 +++ .../sysbuild_release.conf | 9 +++ applications/nrf_desktop/sample.yaml | 71 ++----------------- 36 files changed, 317 insertions(+), 93 deletions(-) delete mode 100644 applications/nrf_desktop/Kconfig.sysbuild create mode 100644 applications/nrf_desktop/SysbuildLists.txt rename applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/{prj.conf => prj_release.conf} (100%) create mode 100644 applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/sysbuild_release.conf rename applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/{prj.conf => prj_release.conf} (100%) create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52820/sysbuild_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild.conf create mode 100644 applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild.conf create mode 100644 applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_dongle.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_fast_pair.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_keyboard.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_qspi.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_smp.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_wwcb.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_3bleconn.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_4llpmconn.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release_4llpmconn.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_fast_pair.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_mcuboot_smp.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release_fast_pair.conf create mode 100644 applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release_fast_pair.conf create mode 100644 applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild.conf create mode 100644 applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild_release.conf create mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild.conf create mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_keyboard.conf create mode 100644 applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_release.conf diff --git a/applications/nrf_desktop/Kconfig.sysbuild b/applications/nrf_desktop/Kconfig.sysbuild deleted file mode 100644 index 2a23808d1f5c..000000000000 --- a/applications/nrf_desktop/Kconfig.sysbuild +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -config NRF_DEFAULT_BLUETOOTH - default y if BOARD_NRF5340DK - -choice BOOTLOADER - default BOOTLOADER_MCUBOOT if BOARD_NRF52833DK_NRF52833 || BOARD_NRF52833DONGLE || BOARD_NRF54L15PDK -endchoice - -choice MCUBOOT_MODE - default MCUBOOT_MODE_SINGLE_APP if BOARD_NRF52833DK || BOARD_NRF52820DONGLE || BOARD_NRF52833DONGLE - default MCUBOOT_MODE_DIRECT_XIP if BOARD_NRF54L15PDK -endchoice - -config SECURE_BOOT - default y if BOARD_NRF5340DK || BOARD_NRF52840DONGLE || BOARD_NRF52840DK || BOARD_NRF52840GMOUSE - -config SECURE_BOOT_APPCORE - depends on SECURE_BOOT - default y if BOARD_NRF5340DK || BOARD_NRF52840DONGLE || BOARD_NRF52840DK || BOARD_NRF52840GMOUSE - -config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY - default y if BOARD_NRF52840DK_NRF52840 - -source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" diff --git a/applications/nrf_desktop/SysbuildLists.txt b/applications/nrf_desktop/SysbuildLists.txt new file mode 100644 index 000000000000..ac054637ff04 --- /dev/null +++ b/applications/nrf_desktop/SysbuildLists.txt @@ -0,0 +1,12 @@ +# +# Copyright (c) 2024 Nordic Semiconductor +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +# The application uses the configuration/ scheme for configuration files. +set(APPLICATION_CONFIG_DIR "${CMAKE_CURRENT_LIST_DIR}/configuration/\${NORMALIZED_BOARD_TARGET}") + +find_package(Sysbuild REQUIRED HINTS $ENV{ZEPHYR_BASE}) + +project(sysbuild) diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf rename to applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj_release.conf diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/sysbuild_release.conf new file mode 100644 index 000000000000..6abeb9060f29 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/sysbuild_release.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_SINGLE_APP=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf similarity index 100% rename from applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf rename to applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj_release.conf diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/sysbuild_release.conf new file mode 100644 index 000000000000..6abeb9060f29 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52820/sysbuild_release.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_SINGLE_APP=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild.conf new file mode 100644 index 000000000000..6abeb9060f29 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_SINGLE_APP=y diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild_release.conf new file mode 100644 index 000000000000..6abeb9060f29 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild_release.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_SINGLE_APP=y diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild.conf new file mode 100644 index 000000000000..6abeb9060f29 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_SINGLE_APP=y diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild_release.conf new file mode 100644 index 000000000000..6abeb9060f29 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild_release.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_SINGLE_APP=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_dongle.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_dongle.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_fast_pair.conf new file mode 100644 index 000000000000..0d7b85323320 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_fast_pair.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BT_FAST_PAIR=y +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_keyboard.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_keyboard.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_qspi.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_qspi.conf new file mode 100644 index 000000000000..7e307de3c842 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_qspi.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_smp.conf new file mode 100644 index 000000000000..b0e9c49cd310 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_smp.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_release.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_release.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_wwcb.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_wwcb.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_wwcb.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_3bleconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_3bleconn.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_3bleconn.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_4llpmconn.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_4llpmconn.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release_4llpmconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release_4llpmconn.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release_4llpmconn.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_fast_pair.conf new file mode 100644 index 000000000000..0d7b85323320 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_fast_pair.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BT_FAST_PAIR=y +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_mcuboot_smp.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_mcuboot_smp.conf new file mode 100644 index 000000000000..b0e9c49cd310 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_mcuboot_smp.conf @@ -0,0 +1,8 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release_fast_pair.conf new file mode 100644 index 000000000000..0d7b85323320 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release_fast_pair.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BT_FAST_PAIR=y +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release.conf new file mode 100644 index 000000000000..2bcf0c3ee855 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release_fast_pair.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release_fast_pair.conf new file mode 100644 index 000000000000..0d7b85323320 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release_fast_pair.conf @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BT_FAST_PAIR=y +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild.conf new file mode 100644 index 000000000000..e2f5eba5a5e0 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild.conf @@ -0,0 +1,11 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" +SB_CONFIG_NRF_DEFAULT_BLUETOOTH=y diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild_release.conf new file mode 100644 index 000000000000..e2f5eba5a5e0 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild_release.conf @@ -0,0 +1,11 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_SECURE_BOOT=y +SB_CONFIG_SECURE_BOOT_APPCORE=y +SB_CONFIG_SECURE_BOOT_SIGNING_KEY_FILE="b0_private.pem" +SB_CONFIG_NRF_DEFAULT_BLUETOOTH=y diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild.conf new file mode 100644 index 000000000000..15d5f569c66e --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_keyboard.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_keyboard.conf new file mode 100644 index 000000000000..15d5f569c66e --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_keyboard.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y diff --git a/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_release.conf b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_release.conf new file mode 100644 index 000000000000..15d5f569c66e --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_release.conf @@ -0,0 +1,9 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# +################################################################################ + +SB_CONFIG_BOOTLOADER_MCUBOOT=y +SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y diff --git a/applications/nrf_desktop/sample.yaml b/applications/nrf_desktop/sample.yaml index 3f7b3674afe5..9bd508d318ab 100644 --- a/applications/nrf_desktop/sample.yaml +++ b/applications/nrf_desktop/sample.yaml @@ -44,12 +44,6 @@ tests: extra_args: FILE_SUFFIX=fast_pair FP_MODEL_ID=0x8E717D FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= - SB_CONFIG_BT_FAST_PAIR=y - SB_CONFIG_BOOTLOADER_MCUBOOT=y - SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y - SB_CONFIG_SECURE_BOOT_APPCORE=n - SB_CONFIG_SECURE_BOOT=n - SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n applications.nrf_desktop.zdebug_mcuboot_qspi: sysbuild: true build_only: true @@ -58,34 +52,15 @@ tests: - nrf52840dk/nrf52840 tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=mcuboot_qspi - SB_CONFIG_BOOTLOADER_MCUBOOT=y - SB_CONFIG_SECURE_BOOT_APPCORE=n - SB_CONFIG_SECURE_BOOT=n - applications.nrf_desktop.zdebug_mcuboot_smp.nrf52840gmouse: - sysbuild: true - build_only: true - platform_allow: nrf52840gmouse/nrf52840 - integration_platforms: - - nrf52840gmouse/nrf52840 - tags: bluetooth ci_build sysbuild - extra_args: FILE_SUFFIX=mcuboot_smp - SB_CONFIG_BOOTLOADER_MCUBOOT=y - SB_CONFIG_SECURE_BOOT_APPCORE=n - SB_CONFIG_SECURE_BOOT=n - SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n - SB_CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256=y applications.nrf_desktop.zdebug_mcuboot_smp.nrf52840dk: sysbuild: true build_only: true - platform_allow: nrf52840dk/nrf52840 + platform_allow: nrf52840dk/nrf52840 nrf52840gmouse/nrf52840 integration_platforms: - nrf52840dk/nrf52840 + - nrf52840gmouse/nrf52840 tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=mcuboot_smp - SB_CONFIG_BOOTLOADER_MCUBOOT=y - SB_CONFIG_SECURE_BOOT_APPCORE=n - SB_CONFIG_SECURE_BOOT=n - SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n applications.nrf_desktop.zdebugwithshell: sysbuild: true build_only: true @@ -164,13 +139,16 @@ tests: sysbuild: true build_only: true platform_allow: > - nrf52dmouse/nrf52832 nrf52810dmouse/nrf52810 - nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 + nrf52dmouse/nrf52832 nrf52kbd_nrf52832 nrf52810dmouse/nrf52810 nrf52820dongle/nrf52820 + nrf52833dk/nrf52820 nrf52833dk/nrf52833 nrf52833dongle/nrf52833 nrf52840dk/nrf52840 nrf52840dongle/nrf52840 nrf52840gmouse/nrf52840 nrf5340dk/nrf5340/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk@0.3.0/nrf54l15/cpuapp integration_platforms: - nrf52dmouse/nrf52832 + - nrf52kbd/nrf52832 - nrf52810dmouse/nrf52810 + - nrf52820dongle/nrf52820 + - nrf52833dk/nrf52820 - nrf52833dk/nrf52833 - nrf52833dongle/nrf52833 - nrf52840dk/nrf52840 @@ -181,33 +159,6 @@ tests: - nrf54l15pdk@0.3.0/nrf54l15/cpuapp tags: bluetooth ci_build sysbuild extra_args: FILE_SUFFIX=release - applications.nrf_desktop.zrelease.nrf52kbd: - sysbuild: true - build_only: true - platform_allow: > - nrf52kbd/nrf52832 - integration_platforms: - - nrf52kbd/nrf52832 - tags: bluetooth ci_build sysbuild - extra_args: FILE_SUFFIX=release SB_CONFIG_SECURE_BOOT=y SB_CONFIG_SECURE_BOOT_APPCORE=y - applications.nrf_desktop.zrelease.sysbuild.nrf52820dongle_nrf52820: - sysbuild: true - build_only: true - platform_allow: > - nrf52820dongle/nrf52820 - integration_platforms: - - nrf52820dongle/nrf52820 - tags: bluetooth ci_build sysbuild - extra_args: FILE_SUFFIX=release SB_CONFIG_BOOTLOADER_MCUBOOT=y - applications.nrf_desktop.zrelease.sysbuild.nrf52833dk_nrf52820: - sysbuild: true - build_only: true - platform_allow: > - nrf52833dk/nrf52820 - integration_platforms: - - nrf52833dk/nrf52820 - tags: bluetooth ci_build sysbuild - extra_args: FILE_SUFFIX=release SB_CONFIG_BOOTLOADER_MCUBOOT=y applications.nrf_desktop.zrelease_fast_pair.keyboard: sysbuild: true build_only: true @@ -218,10 +169,6 @@ tests: extra_args: FILE_SUFFIX=release_fast_pair FP_MODEL_ID=0x52FF02 FP_ANTI_SPOOFING_KEY=8E8ulwhSIp/skZeg27xmWv2SxRxTOagypHrf2OdrhGY= - SB_CONFIG_BOOTLOADER_MCUBOOT=y - SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y - SB_CONFIG_BT_FAST_PAIR=y - SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n applications.nrf_desktop.zrelease_fast_pair.gmouse: sysbuild: true build_only: true @@ -232,10 +179,6 @@ tests: extra_args: FILE_SUFFIX=release_fast_pair FP_MODEL_ID=0x8E717D FP_ANTI_SPOOFING_KEY=dZxFzP7X9CcfLPC0apyRkmgsh3n2EbWo9NFNXfVuxAM= - SB_CONFIG_BOOTLOADER_MCUBOOT=y - SB_CONFIG_MCUBOOT_MODE_DIRECT_XIP=y - SB_CONFIG_BT_FAST_PAIR=y - SB_CONFIG_PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY=n applications.nrf_desktop.zrelease_4llpmconn: sysbuild: true build_only: true