Skip to content

Commit f38c07b

Browse files
ahasztagtomchy
authored andcommitted
samples: dfu: dfu_multi_image: Fix GPD issues after upmerge
Fixed the build errors resulting from the recent GPD changes Signed-off-by: Artur Hadasz <[email protected]>
1 parent 1a2df1d commit f38c07b

File tree

3 files changed

+65
-9
lines changed

3 files changed

+65
-9
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#
2+
# Copyright (c) 2025 Nordic Semiconductor ASA
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
# Power domains forced on by default on boot, no need
8+
# to manage them in bootloader.
9+
CONFIG_POWER_DOMAIN=n

samples/dfu/dfu_multi_image/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7-
#include "../../nrf54h20dk_nrf54h20_memory_map.dtsi"
7+
#include "../../nrf54h20dk_nrf54h20_memory_map.dtsi"
88

99
/ {
1010
chosen {
@@ -27,3 +27,58 @@ slot2_partition: &cpurad_slot0_partition {
2727
slot3_partition: &cpurad_slot1_partition {
2828
label = "image-3";
2929
};
30+
31+
/*
32+
* Copy required overlay for mcuboot from bootloader/mcuboot.
33+
*
34+
* Required as the overlay in bootloader/mcuboot is ignored due to
35+
* to the added mcuboot overlay in this sample.
36+
*/
37+
38+
&gdpwr {
39+
status = "disabled";
40+
};
41+
42+
&gdpwr_fast_active_0 {
43+
status = "disabled";
44+
};
45+
46+
&gdpwr_fast_active_1 {
47+
status = "disabled";
48+
};
49+
50+
&gdpwr_fast_main {
51+
status = "disabled";
52+
};
53+
54+
&gdpwr_slow_active {
55+
status = "disabled";
56+
};
57+
58+
&gdpwr_slow_main {
59+
status = "disabled";
60+
};
61+
62+
&gpio_pad_group0 {
63+
status = "disabled";
64+
};
65+
66+
&gpio_pad_group1 {
67+
status = "disabled";
68+
};
69+
70+
&gpio_pad_group2 {
71+
status = "disabled";
72+
};
73+
74+
&gpio_pad_group6 {
75+
status = "disabled";
76+
};
77+
78+
&gpio_pad_group7 {
79+
status = "disabled";
80+
};
81+
82+
&gpio_pad_group9 {
83+
status = "disabled";
84+
};

scripts/quarantine.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,3 @@
100100
platforms:
101101
- thingy53/nrf5340/cpuapp
102102
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35522"
103-
104-
- scenarios:
105-
- sample.dfu.dfu_multi_image
106-
- sample.dfu.dfu_multi_image.encryption
107-
- sample.dfu.dfu_multi_image.save_progress
108-
platforms:
109-
- [email protected]/nrf54h20/cpuapp
110-
comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35605"

0 commit comments

Comments
 (0)