Skip to content

Commit

Permalink
applications: nrf_desktop: Integrate APPLICATION_CONFIG_DIR for sysbuild
Browse files Browse the repository at this point in the history 
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 <Marek.Pieta@nordicsemi.no>
  • Loading branch information
@MarekPieta
MarekPieta committed May 17, 2024
1 parent 781d5a2 commit 9360c89
Show file tree
Hide file tree
Showing 36 changed files with 317 additions and 93 deletions.
29 changes: 0 additions & 29 deletions applications/nrf_desktop/Kconfig.sysbuild
View file

This file was deleted.

12 changes: 12 additions & 0 deletions applications/nrf_desktop/SysbuildLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#
# Copyright (c) 2024 Nordic Semiconductor
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# The application uses the configuration/<board> 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)
0 ...20dongle_nrf52820/images/mcuboot/prj.conf → ..._nrf52820/images/mcuboot/prj_release.conf
View file
File renamed without changes.
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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
0 ...f52833dk_nrf52820/images/mcuboot/prj.conf → ..._nrf52820/images/mcuboot/prj_release.conf
View file
File renamed without changes.
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52820/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild.conf
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild.conf
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_dongle.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_fast_pair.conf
View file
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_keyboard.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_qspi.conf
View file
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_mcuboot_smp.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#
################################################################################

SB_CONFIG_BOOTLOADER_MCUBOOT=y
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/sysbuild_wwcb.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_3bleconn.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_4llpmconn.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions ...cations/nrf_desktop/configuration/nrf52840dongle_nrf52840/sysbuild_release_4llpmconn.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_fast_pair.conf
View file
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_mcuboot_smp.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#
# Copyright (c) 2024 Nordic Semiconductor ASA
#
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#
################################################################################

SB_CONFIG_BOOTLOADER_MCUBOOT=y
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions ...cations/nrf_desktop/configuration/nrf52840gmouse_nrf52840/sysbuild_release_fast_pair.conf
View file
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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"
10 changes: 10 additions & 0 deletions applications/nrf_desktop/configuration/nrf52kbd_nrf52832/sysbuild_release_fast_pair.conf
View file
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild.conf
View file
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild.conf
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_keyboard.conf
View file
Original file line number Diff line number Diff line change
@@ -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
9 changes: 9 additions & 0 deletions applications/nrf_desktop/configuration/nrf54l15pdk_nrf54l15_cpuapp/sysbuild_release.conf
View file
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 9360c89

Please sign in to comment.