Skip to content

Commit 40454ad

Browse files
maje-embrlubos
maje-emb
authored and
rlubos
committed
applications: nrf_desktop: Deprecate Partition Manager for nRF54L10
Deprecated Partition Manager for nrf54l15dk/nRF54l10 target. Now memory map is configured through DTS. The old Partition Manager configurations are still supported. The change affects the following configuration variants: - default - release - keyboard - fast_pair Ref: NCSDK-38504 Signed-off-by: Marcin Jelinski <marcin.jelinski@nordicsemi.no>
1 parent 7818b3f commit 40454ad

19 files changed

Lines changed: 177 additions & 26 deletions

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/app.overlay‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
/*
2-
* Copyright (c) 2025 Nordic Semiconductor ASA
2+
* Copyright (c) 2025-2026 Nordic Semiconductor ASA
33
*
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7+
#include "memory_map.dtsi"
78
#include "app_common.dtsi"

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/app_common.dtsi‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
/*
2-
* Copyright (c) 2025 Nordic Semiconductor ASA
2+
* Copyright (c) 2025-2026 Nordic Semiconductor ASA
33
*
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7-
/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */
8-
&cpuapp_rram {
9-
reg = <0x0 DT_SIZE_K(1012)>;
10-
};
7+
secondary_app_partition: &slot1_partition {};
118

129
/ {
1310
/* Disable pwmleds and redefine them to align configuration with CAF LEDs requirements.

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/app_fast_pair.overlay‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*
2+
* Copyright (c) 2026 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
#include "memory_map_fast_pair.dtsi"
8+
#include "app_common.dtsi"

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/app_keyboard.overlay‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*
2+
* Copyright (c) 2026 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
#include "memory_map.dtsi"
8+
#include "app_common.dtsi"

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/app_release.overlay‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/*
2-
* Copyright (c) 2025 Nordic Semiconductor ASA
2+
* Copyright (c) 2025-2026 Nordic Semiconductor ASA
33
*
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7+
#include "memory_map.dtsi"
78
#include "app_common.dtsi"
89

910
/* For nRF54L, watchdog status is disabled by default. Needs to be enabled in DTS overlay. */

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/images/mcuboot/app.overlay‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
/*
2-
* Copyright (c) 2025 Nordic Semiconductor ASA
2+
* Copyright (c) 2025-2026 Nordic Semiconductor ASA
33
*
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7-
/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */
8-
&cpuapp_rram {
9-
reg = <0x0 DT_SIZE_K(1012)>;
7+
#include "../../memory_map.dtsi"
8+
9+
/* The nRF54L15 DK defines memory map using DTS.
10+
* Assign the bootloader partition to MCUboot image.
11+
*/
12+
/ {
13+
chosen {
14+
zephyr,code-partition = &boot_partition;
15+
};
1016
};

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/images/mcuboot/app_fast_pair.overlay‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright (c) 2026 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
#include "../../memory_map_fast_pair.dtsi"
8+
9+
/* The nRF54L15 DK defines memory map using DTS.
10+
* Assign the bootloader partition to MCUboot image.
11+
*/
12+
/ {
13+
chosen {
14+
zephyr,code-partition = &boot_partition;
15+
};
16+
};

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/images/mcuboot/app_keyboard.overlay‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright (c) 2026 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
#include "../../memory_map.dtsi"
8+
9+
/* The nRF54L15 DK defines memory map using DTS.
10+
* Assign the bootloader partition to MCUboot image.
11+
*/
12+
/ {
13+
chosen {
14+
zephyr,code-partition = &boot_partition;
15+
};
16+
};

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/images/mcuboot/app_release.overlay‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright (c) 2026 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
#include "../../memory_map.dtsi"
8+
9+
/* The nRF54L15 DK defines memory map using DTS.
10+
* Assign the bootloader partition to MCUboot image.
11+
*/
12+
/ {
13+
chosen {
14+
zephyr,code-partition = &boot_partition;
15+
};
16+
};

‎applications/nrf_desktop/configuration/nrf54l15dk_nrf54l10_cpuapp/images/mcuboot/prj.conf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2025 Nordic Semiconductor ASA
2+
# Copyright (c) 2025-2026 Nordic Semiconductor ASA
33
#
44
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
#
@@ -8,7 +8,6 @@ CONFIG_SIZE_OPTIMIZATIONS=y
88
CONFIG_HW_STACK_PROTECTION=y
99

1010
CONFIG_MAIN_STACK_SIZE=10240
11-
CONFIG_BOOT_MAX_IMG_SECTORS=256
1211
CONFIG_BOOT_BOOTSTRAP=n
1312

1413
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y

0 commit comments

Comments
 (0)