Skip to content

Commit ed779ee

Browse files
maje-embrlubos
authored andcommitted
applications: nrf_desktop: Deprecate Partition Manager for nRF54LM20A
Deprecated Partition Manager for nrf54lm20dk/nRF54LM20A target. Now memory map is configured through DTS. The old Partition Manager configurations are still supported. The change affects the following configuration variants: - debug (prj.conf) - llvm (prj_llvm.conf) - release (prj_release.conf) Ref: NCSDK-38504 Signed-off-by: Marcin Jelinski <marcin.jelinski@nordicsemi.no>
1 parent 40454ad commit ed779ee

18 files changed

Lines changed: 139 additions & 44 deletions

applications/nrf_desktop/configuration/nrf54lm20dk_nrf54lm20a_cpuapp/app.overlay

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
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

9-
/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */
10-
&cpuapp_rram {
11-
reg = <0x0 DT_SIZE_K(2036)>;
12-
};
13-
1410
/ {
1511
hid_dev_0: hid_dev_0 {
1612
compatible = "zephyr,hid-device";

applications/nrf_desktop/configuration/nrf54lm20dk_nrf54lm20a_cpuapp/app_common.dtsi

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
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+
secondary_app_partition: &slot1_partition {};
8+
79
/ {
810
/* Disable pwmleds and redefine them to align configuration with CAF LEDs requirements. */
911
/delete-node/ pwmleds;

applications/nrf_desktop/configuration/nrf54lm20dk_nrf54lm20a_cpuapp/app_llvm.overlay

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
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_llvm.dtsi"
78
#include "app_common.dtsi"
89

9-
/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */
10-
&cpuapp_rram {
11-
reg = <0x0 DT_SIZE_K(2036)>;
12-
};
13-
1410
/ {
1511
hid_dev_0: hid_dev_0 {
1612
compatible = "zephyr,hid-device";

applications/nrf_desktop/configuration/nrf54lm20dk_nrf54lm20a_cpuapp/app_release.overlay

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
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

9-
/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */
10-
&cpuapp_rram {
11-
reg = <0x0 DT_SIZE_K(2036)>;
12-
};
13-
1410
/ {
1511
hid_dev_0: hid_dev_0 {
1612
compatible = "zephyr,hid-device";
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(2036)>;
7+
#include "../../memory_map.dtsi"
8+
9+
/* The nRF54LM20 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
};
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(2036)>;
7+
#include "../../memory_map_llvm.dtsi"
8+
9+
/* The nRF54LM20 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
};
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(2036)>;
7+
#include "../../memory_map.dtsi"
8+
9+
/* The nRF54LM20 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/nrf54lm20dk_nrf54lm20a_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

applications/nrf_desktop/configuration/nrf54lm20dk_nrf54lm20a_cpuapp/images/mcuboot/prj_llvm.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_AGGRESSIVE=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

applications/nrf_desktop/configuration/nrf54lm20dk_nrf54lm20a_cpuapp/images/mcuboot/prj_release.conf

Lines changed: 1 addition & 3 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,8 +8,6 @@ CONFIG_SIZE_OPTIMIZATIONS=y
88
CONFIG_HW_STACK_PROTECTION=y
99

1010
CONFIG_MAIN_STACK_SIZE=10240
11-
12-
CONFIG_BOOT_MAX_IMG_SECTORS=256
1311
CONFIG_BOOT_BOOTSTRAP=n
1412

1513
CONFIG_BOOT_VERSION_CMP_USE_BUILD_NUMBER=y

0 commit comments

Comments
 (0)