From 368b5f4aac391a54b059376889b32f7316a37378 Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Thu, 17 Jul 2025 09:35:32 +0200 Subject: [PATCH 1/4] [nrf fromtree] zephyr: boards: nrf54h20dk: disable power domains The nrf54h20 power domains are forced on at boot, no need to enable them or their drivers unless they are to be managed further within the bootloader. Signed-off-by: Bjarki Arge Andreasen (cherry picked from commit 37bc4aa4f8b7e37683fc4426e7789f70d8422e4a) --- .../nrf54h20dk_nrf54h20_cpuapp_iron.conf | 4 ++ .../nrf54h20dk_nrf54h20_cpuapp_iron.overlay | 53 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay diff --git a/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf index 31666d9fe..cddf7b646 100644 --- a/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf +++ b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf @@ -10,3 +10,7 @@ CONFIG_SPI_NOR=n CONFIG_FPROTECT=n CONFIG_BOOT_WATCHDOG_FEED=n + +# Power domains forced on by default on boot, no need +# to manage them in bootloader. +CONFIG_POWER_DOMAIN=n diff --git a/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay new file mode 100644 index 000000000..d564ed924 --- /dev/null +++ b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2025 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ + +&gdpwr { + status = "disabled"; +}; + +&gdpwr_fast_active_0 { + status = "disabled"; +}; + +&gdpwr_fast_active_1 { + status = "disabled"; +}; + +&gdpwr_fast_main { + status = "disabled"; +}; + +&gdpwr_slow_active { + status = "disabled"; +}; + +&gdpwr_slow_main { + status = "disabled"; +}; + +&gpio_pad_group0 { + status = "disabled"; +}; + +&gpio_pad_group1 { + status = "disabled"; +}; + +&gpio_pad_group2 { + status = "disabled"; +}; + +&gpio_pad_group6 { + status = "disabled"; +}; + +&gpio_pad_group7 { + status = "disabled"; +}; + +&gpio_pad_group9 { + status = "disabled"; +}; From 4645fcf15990d977a0672bdd4a07e419b0d1e40d Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Wed, 6 Aug 2025 16:00:50 +0200 Subject: [PATCH 2/4] Revert "[nrf noup] boot/zephyr: nrf54h20dk board support" This reverts commit c872f6ab7bd026fe779543f24ede6d2b343202f3. Signed-off-by: Bjarki Arge Andreasen --- boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf index cddf7b646..30594ff39 100644 --- a/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf +++ b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf @@ -6,9 +6,6 @@ # Ensure that the SPI NOR driver is disabled by default CONFIG_SPI_NOR=n -# TODO: below are not yet supported and need fixing -CONFIG_FPROTECT=n - CONFIG_BOOT_WATCHDOG_FEED=n # Power domains forced on by default on boot, no need From 40821154f6b30878ab005a706beb0d413a7bd7b9 Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Tue, 5 Aug 2025 19:53:54 +0200 Subject: [PATCH 3/4] [nrf fromtree] boot: zephyr: boards: update name of nrf54h20dk The nrf54h20dk no longer has the variant "iron". "iron" has become the default so the name of the target is now just nrf54h20dk_nrf54h20_cpuapp. Signed-off-by: Bjarki Arge Andreasen (cherry picked from commit 2969058167220b0a02597912008d82a9218c117e) --- ..._nrf54h20_cpuapp_iron.conf => nrf54h20dk_nrf54h20_cpuapp.conf} | 0 ...h20_cpuapp_iron.overlay => nrf54h20dk_nrf54h20_cpuapp.overlay} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename boot/zephyr/boards/{nrf54h20dk_nrf54h20_cpuapp_iron.conf => nrf54h20dk_nrf54h20_cpuapp.conf} (100%) rename boot/zephyr/boards/{nrf54h20dk_nrf54h20_cpuapp_iron.overlay => nrf54h20dk_nrf54h20_cpuapp.overlay} (100%) diff --git a/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp.conf similarity index 100% rename from boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf rename to boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp.conf diff --git a/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay similarity index 100% rename from boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.overlay rename to boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp.overlay From aadbd2ab59cf6db0e3566fca4c8afd07dd7fd5f0 Mon Sep 17 00:00:00 2001 From: Michal Kozikowski Date: Mon, 10 Mar 2025 17:23:37 +0100 Subject: [PATCH 4/4] [nrf noup] boot/zephyr: nrf54h20dk board support Added basic support for nrf54h20dk_nrf54h20_cpuapp_iron board. This commit turns off CONFIG_FPROTECT for this board build. Signed-off-by: Michal Kozikowski (cherry picked from commit b404bb106afc4705ffe9b92a63196f8881500195) --- boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp.conf index 30594ff39..cddf7b646 100644 --- a/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/boot/zephyr/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -6,6 +6,9 @@ # Ensure that the SPI NOR driver is disabled by default CONFIG_SPI_NOR=n +# TODO: below are not yet supported and need fixing +CONFIG_FPROTECT=n + CONFIG_BOOT_WATCHDOG_FEED=n # Power domains forced on by default on boot, no need