Skip to content

Commit f3c0f26

Browse files
bjarki-andreasencarlescufi
bjarki-andreasen
authored and
carlescufi
committed
nrf54h20: align with removal of gpio_pad_groups
gpio_pad_groups have been removed, and gdpwr domains are no longer included if no multithreading (mcuboot) by default, align samples which previously disabled them manually. Signed-off-by: Bjarki Arge Andreasen <[email protected]>
1 parent a739d43 commit f3c0f26

File tree

9 files changed

+1
-389
lines changed

9 files changed

+1
-389
lines changed

‎samples/dfu/dfu_multi_image/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -27,58 +27,3 @@ 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-
};

‎samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,3 @@
99
zephyr,code-partition = &boot_partition;
1010
};
1111
};
12-
13-
&gdpwr {
14-
status = "disabled";
15-
};
16-
17-
&gdpwr_fast_active_0 {
18-
status = "disabled";
19-
};
20-
21-
&gdpwr_fast_active_1 {
22-
status = "disabled";
23-
};
24-
25-
&gdpwr_fast_main {
26-
status = "disabled";
27-
};
28-
29-
&gdpwr_slow_active {
30-
status = "disabled";
31-
};
32-
33-
&gdpwr_slow_main {
34-
status = "disabled";
35-
};
36-
37-
&gpio_pad_group0 {
38-
status = "disabled";
39-
};
40-
41-
&gpio_pad_group1 {
42-
status = "disabled";
43-
};
44-
45-
&gpio_pad_group2 {
46-
status = "disabled";
47-
};
48-
49-
&gpio_pad_group6 {
50-
status = "disabled";
51-
};
52-
53-
&gpio_pad_group7 {
54-
status = "disabled";
55-
};
56-
57-
&gpio_pad_group9 {
58-
status = "disabled";
59-
};

‎samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -11,58 +11,3 @@
1111
zephyr,code-partition = &boot_partition;
1212
};
1313
};
14-
15-
/*
16-
* Copy required overlay for mcuboot from bootloader/mcuboot.
17-
*
18-
* Required as the overlay in bootloader/mcuboot is ignored due to
19-
* FILE_SUFFIX="merged_slot" matching this overlay instead.
20-
*/
21-
22-
&gdpwr {
23-
status = "disabled";
24-
};
25-
26-
&gdpwr_fast_active_0 {
27-
status = "disabled";
28-
};
29-
30-
&gdpwr_fast_active_1 {
31-
status = "disabled";
32-
};
33-
34-
&gdpwr_fast_main {
35-
status = "disabled";
36-
};
37-
38-
&gdpwr_slow_active {
39-
status = "disabled";
40-
};
41-
42-
&gdpwr_slow_main {
43-
status = "disabled";
44-
};
45-
46-
&gpio_pad_group0 {
47-
status = "disabled";
48-
};
49-
50-
&gpio_pad_group1 {
51-
status = "disabled";
52-
};
53-
54-
&gpio_pad_group2 {
55-
status = "disabled";
56-
};
57-
58-
&gpio_pad_group6 {
59-
status = "disabled";
60-
};
61-
62-
&gpio_pad_group7 {
63-
status = "disabled";
64-
};
65-
66-
&gpio_pad_group9 {
67-
status = "disabled";
68-
};

‎samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_requests.overlay‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -11,58 +11,3 @@
1111
zephyr,code-partition = &boot_partition;
1212
};
1313
};
14-
15-
/*
16-
* Copy required overlay for mcuboot from bootloader/mcuboot.
17-
*
18-
* Required as the overlay in bootloader/mcuboot is ignored due to
19-
* FILE_SUFFIX="merged_slot" matching this overlay instead.
20-
*/
21-
22-
&gdpwr {
23-
status = "disabled";
24-
};
25-
26-
&gdpwr_fast_active_0 {
27-
status = "disabled";
28-
};
29-
30-
&gdpwr_fast_active_1 {
31-
status = "disabled";
32-
};
33-
34-
&gdpwr_fast_main {
35-
status = "disabled";
36-
};
37-
38-
&gdpwr_slow_active {
39-
status = "disabled";
40-
};
41-
42-
&gdpwr_slow_main {
43-
status = "disabled";
44-
};
45-
46-
&gpio_pad_group0 {
47-
status = "disabled";
48-
};
49-
50-
&gpio_pad_group1 {
51-
status = "disabled";
52-
};
53-
54-
&gpio_pad_group2 {
55-
status = "disabled";
56-
};
57-
58-
&gpio_pad_group6 {
59-
status = "disabled";
60-
};
61-
62-
&gpio_pad_group7 {
63-
status = "disabled";
64-
};
65-
66-
&gpio_pad_group9 {
67-
status = "disabled";
68-
};

‎tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ CONFIG_FPROTECT=n
22

33
CONFIG_BOOT_WATCHDOG_FEED=n
44

5-
# Power domains forced on by default on boot, no need
6-
# to manage them in bootloader.
5+
# Disable to save ROM
76
CONFIG_POWER_DOMAIN=n

‎tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,3 @@
33
zephyr,code-partition = &boot_partition;
44
};
55
};
6-
7-
/*
8-
* Copy required overlay for mcuboot from bootloader/mcuboot.
9-
*
10-
* Required as the overlay in bootloader/mcuboot is ignored due to
11-
* board overlay in this test.
12-
*/
13-
14-
&gdpwr {
15-
status = "disabled";
16-
};
17-
18-
&gdpwr_fast_active_0 {
19-
status = "disabled";
20-
};
21-
22-
&gdpwr_fast_active_1 {
23-
status = "disabled";
24-
};
25-
26-
&gdpwr_fast_main {
27-
status = "disabled";
28-
};
29-
30-
&gdpwr_slow_active {
31-
status = "disabled";
32-
};
33-
34-
&gdpwr_slow_main {
35-
status = "disabled";
36-
};
37-
38-
&gpio_pad_group0 {
39-
status = "disabled";
40-
};
41-
42-
&gpio_pad_group1 {
43-
status = "disabled";
44-
};
45-
46-
&gpio_pad_group2 {
47-
status = "disabled";
48-
};
49-
50-
&gpio_pad_group6 {
51-
status = "disabled";
52-
};
53-
54-
&gpio_pad_group7 {
55-
status = "disabled";
56-
};
57-
58-
&gpio_pad_group9 {
59-
status = "disabled";
60-
};

‎tests/subsys/bootloader/upgrade/ref_smp_svr/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp_direct_xip.overlay‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -11,58 +11,3 @@
1111
zephyr,code-partition = &boot_partition;
1212
};
1313
};
14-
15-
/*
16-
* Copy required overlay for mcuboot from bootloader/mcuboot.
17-
*
18-
* Required as the overlay in bootloader/mcuboot is ignored due to
19-
* board overlay in this test.
20-
*/
21-
22-
&gdpwr {
23-
status = "disabled";
24-
};
25-
26-
&gdpwr_fast_active_0 {
27-
status = "disabled";
28-
};
29-
30-
&gdpwr_fast_active_1 {
31-
status = "disabled";
32-
};
33-
34-
&gdpwr_fast_main {
35-
status = "disabled";
36-
};
37-
38-
&gdpwr_slow_active {
39-
status = "disabled";
40-
};
41-
42-
&gdpwr_slow_main {
43-
status = "disabled";
44-
};
45-
46-
&gpio_pad_group0 {
47-
status = "disabled";
48-
};
49-
50-
&gpio_pad_group1 {
51-
status = "disabled";
52-
};
53-
54-
&gpio_pad_group2 {
55-
status = "disabled";
56-
};
57-
58-
&gpio_pad_group6 {
59-
status = "disabled";
60-
};
61-
62-
&gpio_pad_group7 {
63-
status = "disabled";
64-
};
65-
66-
&gpio_pad_group9 {
67-
status = "disabled";
68-
};

0 commit comments

Comments
 (0)