From 9a6f116a6aa9b70b517a420247cd8d33bbbbaaa3 Mon Sep 17 00:00:00 2001 From: Michal Kozikowski Date: Wed, 23 Apr 2025 12:35:38 +0200 Subject: [PATCH] soc: nordic: nrf54h: Disable GPD for MCUBoot Disable GPD for MCUBoot build, as it cannot be reinitialized later in application (SDFW does not support reinitialization). Also, remove the GPD disabling from the mcumgr sample for nRF54H20 iron board app - it was the reinitialization that caused problems. Signed-off-by: Michal Kozikowski --- .../mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf | 3 --- soc/nordic/nrf54h/gpd/Kconfig | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf diff --git a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf deleted file mode 100644 index 13e4e98c203..00000000000 --- a/samples/subsys/mgmt/mcumgr/smp_svr/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Disable GPD because no IPC is enabled in SSDFW -CONFIG_SOC_NRF54H20_GPD=n -CONFIG_PM=n diff --git a/soc/nordic/nrf54h/gpd/Kconfig b/soc/nordic/nrf54h/gpd/Kconfig index 98b374f6de9..6288aa24a08 100644 --- a/soc/nordic/nrf54h/gpd/Kconfig +++ b/soc/nordic/nrf54h/gpd/Kconfig @@ -6,6 +6,6 @@ config SOC_NRF54H20_GPD imply NRFS imply NRFS_GDPWR_SERVICE_ENABLED select ONOFF - default y if SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD + default y if !MCUBOOT && (SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD) help This option enables the Global Power Domain service.