nrfconnect · bjarki-andreasen · Sep 18, 2024 · Oct 8, 2024 · Sep 26, 2024 · Sep 13, 2024
diff --git a/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk b/boards/nordic/nrf54h20dk/Kconfig.nrf54h20dk
@@ -2,9 +2,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_NRF54H20DK
-	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP
-	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD
-	select SOC_NRF54H20_CPUPPR if BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
-				      BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP
-	select SOC_NRF54H20_CPUFLPR if BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
-				       BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP
+	select SOC_NRF54H20_ENGB_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_ENGB_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_ENGB_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
+				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_ENGB_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
+				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.8.0"
+	select SOC_NRF54H20_CPUAPP if BOARD_NRF54H20DK_NRF54H20_CPUAPP && BOARD_REVISION = "0.9.0"
+	select SOC_NRF54H20_CPURAD if BOARD_NRF54H20DK_NRF54H20_CPURAD && BOARD_REVISION = "0.9.0"
+	select SOC_NRF54H20_CPUPPR if (BOARD_NRF54H20DK_NRF54H20_CPUPPR || \
+				       BOARD_NRF54H20DK_NRF54H20_CPUPPR_XIP) && BOARD_REVISION = "0.9.0"
+	select SOC_NRF54H20_CPUFLPR if (BOARD_NRF54H20DK_NRF54H20_CPUFLPR || \
+				        BOARD_NRF54H20DK_NRF54H20_CPUFLPR_XIP) && BOARD_REVISION = "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/board.yml b/boards/nordic/nrf54h20dk/board.yml
@@ -8,3 +8,9 @@ board:
       cpucluster: cpuppr
     - name: xip
       cpucluster: cpuflpr
+  revision:
+    format: major.minor.patch
+    default: "0.9.0"
+    revisions:
+    - name: "0.8.0"
+    - name: "0.9.0"
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp_0_8_0.yaml
@@ -0,0 +1,24 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: [email protected]/nrf54h20/cpuapp
+name: nRF54H20-DK-nRF54H20-Application (revision 0.8.0)
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 256
+flash: 296
+supported:
+  - adc
+  - can
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - spi
+  - watchdog
+  - usbd
diff --git a/...rf54h20dk/nrf54h20dk_nrf54h20_cpuapp.yaml → ...0dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml b/...rf54h20dk/nrf54h20dk_nrf54h20_cpuapp.yaml → ...0dk/nrf54h20dk_nrf54h20_cpuapp_0_9_0.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 identifier: nrf54h20dk/nrf54h20/cpuapp
-name: nRF54H20-DK-nRF54H20-Application
+name: nRF54H20-DK-nRF54H20-Application (revision 0.9.0)
 type: mcu
 arch: arm
 toolchain:

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_0_8_0.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: [email protected]/nrf54h20/cpuflpr
+name: nRF54H20-DK-nRF54H20-FLPR (revision 0.8.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 46
+flash: 46
+supported:
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - spi
diff --git a/...f54h20dk/nrf54h20dk_nrf54h20_cpuflpr.yaml → ...dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml b/...f54h20dk/nrf54h20dk_nrf54h20_cpuflpr.yaml → ...dk/nrf54h20dk_nrf54h20_cpuflpr_0_9_0.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 identifier: nrf54h20dk/nrf54h20/cpuflpr
-name: nRF54H20-DK-nRF54H20-FLPR
+name: nRF54H20-DK-nRF54H20-FLPR (revision 0.9.0)
 type: mcu
 arch: riscv
 toolchain:

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuflpr_xip_0_8_0.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: [email protected]/nrf54h20/cpuflpr/xip
+name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP) (revision 0.8.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 46
+flash: 48
+supported:
+  - gpio
diff --git a/...20dk/nrf54h20dk_nrf54h20_cpuflpr_xip.yaml → ...rf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml b/...20dk/nrf54h20dk_nrf54h20_cpuflpr_xip.yaml → ...rf54h20dk_nrf54h20_cpuflpr_xip_0_9_0.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 identifier: nrf54h20dk/nrf54h20/cpuflpr/xip
-name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP)
+name: nRF54H20-DK-nRF54H20-FLPR (MRAM XIP) (revision 0.9.0)
 type: mcu
 arch: riscv
 toolchain:

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_0_8_0.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: [email protected]/nrf54h20/cpuppr
+name: nRF54H20-DK-nRF54H20-PPR (revision 0.8.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 62
+flash: 62
+supported:
+  - counter
+  - gpio
+  - i2c
+  - pwm
+  - spi
diff --git a/...rf54h20dk/nrf54h20dk_nrf54h20_cpuppr.yaml → ...0dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml b/...rf54h20dk/nrf54h20dk_nrf54h20_cpuppr.yaml → ...0dk/nrf54h20dk_nrf54h20_cpuppr_0_9_0.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 identifier: nrf54h20dk/nrf54h20/cpuppr
-name: nRF54H20-DK-nRF54H20-PPR
+name: nRF54H20-DK-nRF54H20-PPR (revision 0.9.0)
 type: mcu
 arch: riscv
 toolchain:

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuppr_xip_0_8_0.yaml
@@ -0,0 +1,14 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: [email protected]/nrf54h20/cpuppr/xip
+name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP) (revision 0.8.0)
+type: mcu
+arch: riscv
+toolchain:
+  - zephyr
+sysbuild: true
+ram: 62
+flash: 64
+supported:
+  - gpio
diff --git a/...h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.yaml → ...nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml b/...h20dk/nrf54h20dk_nrf54h20_cpuppr_xip.yaml → ...nrf54h20dk_nrf54h20_cpuppr_xip_0_9_0.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 identifier: nrf54h20dk/nrf54h20/cpuppr/xip
-name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP)
+name: nRF54H20-DK-nRF54H20-PPR (MRAM XIP) (revision 0.9.0)
 type: mcu
 arch: riscv
 toolchain:

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad_0_8_0.yaml
@@ -0,0 +1,19 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+identifier: [email protected]/nrf54h20/cpurad
+name: nRF54H20-DK-nRF54H20-Radio (revision 0.8.0)
+type: mcu
+arch: arm
+toolchain:
+  - gnuarmemb
+  - xtools
+  - zephyr
+sysbuild: true
+ram: 192
+flash: 256
+supported:
+  - counter
+  - gpio
+  - pwm
+  - spi
diff --git a/...rf54h20dk/nrf54h20dk_nrf54h20_cpurad.yaml → ...0dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml b/...rf54h20dk/nrf54h20dk_nrf54h20_cpurad.yaml → ...0dk/nrf54h20dk_nrf54h20_cpurad_0_9_0.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 identifier: nrf54h20dk/nrf54h20/cpurad
-name: nRF54H20-DK-nRF54H20-Radio
+name: nRF54H20-DK-nRF54H20-Radio (revision 0.9.0)
 type: mcu
 arch: arm
 toolchain:

diff --git a/drivers/adc/adc_nrfx_saadc.c b/drivers/adc/adc_nrfx_saadc.c
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(adc_nrfx_saadc);
 
 #if (NRF_SAADC_HAS_AIN_AS_PIN)
 
-#if defined(CONFIG_SOC_NRF54H20) || defined(CONFIG_SOC_NRF9280)
+#if defined(CONFIG_NRF_PLATFORM_HALTIUM)
 static const uint8_t saadc_psels[NRF_SAADC_AIN7 + 1] = {
 	[NRF_SAADC_AIN0] = NRF_PIN_PORT_TO_PIN_NUMBER(0U, 1),
 	[NRF_SAADC_AIN1] = NRF_PIN_PORT_TO_PIN_NUMBER(1U, 1),

diff --git a/drivers/audio/Kconfig.dmic_pdm_nrfx b/drivers/audio/Kconfig.dmic_pdm_nrfx
@@ -5,7 +5,7 @@ config AUDIO_DMIC_NRFX_PDM
 	bool "nRF PDM nrfx driver"
 	default y
 	depends on DT_HAS_NORDIC_NRF_PDM_ENABLED
-	select NRFX_PDM
+	select NRFX_PDM0 if HAS_HW_NRF_PDM0
 	select PINCTRL
 	help
 	  Enable support for nrfx PDM driver for nRF MCU series.
diff --git a/drivers/timer/Kconfig.nrf_grtc b/drivers/timer/Kconfig.nrf_grtc
@@ -15,11 +15,10 @@ menuconfig NRF_GRTC_TIMER
 
 if NRF_GRTC_TIMER
 
-config NRF_GRTC_SLEEP_ALLOWED
-	def_bool y
-	depends on POWEROFF
+config NRF_GRTC_ALWAYS_ON
+	bool
 	help
-	  This feature allows GRTC SYSCOUNTER to go to sleep state.
+	  Always keep the SYSCOUNTER active even if the CPU is in sleep mode.
 
 config NRF_GRTC_TIMER_APP_DEFINED_INIT
 	bool "Application defines GRTC initialization"
@@ -44,7 +43,7 @@ config NRF_GRTC_TIMER_CLOCK_MANAGEMENT
 config NRF_GRTC_SYSCOUNTER_SLEEP_MINIMUM_LATENCY
 	int
 	default 1000
-	depends on NRF_GRTC_SLEEP_ALLOWED
+	depends on POWEROFF
 	help
 	  The value (in us) ensures that the wakeup event will not fire
 	  too early. In other words, applying SYSCOUNTER sleep state for less than

diff --git a/drivers/timer/nrf_grtc_timer.c b/drivers/timer/nrf_grtc_timer.c
@@ -367,7 +367,7 @@ int z_nrf_grtc_timer_capture_read(int32_t chan, uint64_t *captured_time)
 	return 0;
 }
 
-#if defined(CONFIG_NRF_GRTC_SLEEP_ALLOWED) && defined(CONFIG_NRF_GRTC_START_SYSCOUNTER)
+#if defined(CONFIG_POWEROFF) && defined(CONFIG_NRF_GRTC_START_SYSCOUNTER)
 int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 {
 	nrfx_err_t err_code;
@@ -432,7 +432,7 @@ int z_nrf_grtc_wakeup_prepare(uint64_t wake_time_us)
 	k_spin_unlock(&lock, key);
 	return 0;
 }
-#endif /* CONFIG_NRF_GRTC_SLEEP_ALLOWED */
+#endif /* CONFIG_POWEROFF */
 
 uint32_t sys_clock_cycle_get_32(void)
 {
@@ -465,12 +465,6 @@ static int sys_clock_driver_init(void)
 {
 	nrfx_err_t err_code;
 
-#if defined(CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT) &&                                             \
-	(defined(NRF_GRTC_HAS_CLKSEL) && (NRF_GRTC_HAS_CLKSEL == 1))
-	/* Use System LFCLK as the low-frequency clock source during initialization. */
-	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFCLK);
-#endif
-
 	IRQ_CONNECT(DT_IRQN(GRTC_NODE), DT_IRQ(GRTC_NODE, priority), nrfx_isr,
 		    nrfx_grtc_irq_handler, 0);
 
@@ -513,6 +507,9 @@ static int sys_clock_driver_init(void)
 	nrfx_grtc_clock_source_set(NRF_GRTC_CLKSEL_LFXO);
 #endif
 
+#if defined(CONFIG_NRF_GRTC_ALWAYS_ON)
+	nrfx_grtc_active_request_set(true);
+#endif
 	return 0;
 }
 

diff --git a/modules/hal_nordic/nrfs/Kconfig b/modules/hal_nordic/nrfs/Kconfig
@@ -36,7 +36,12 @@ config NRFS_HAS_VBUS_DETECTOR_SERVICE
 
 config NRFS
 	bool "nRF Services Support"
-	select NRFS_LOCAL_DOMAIN if (SOC_NRF54H20_CPUAPP || SOC_NRF54H20_CPURAD || SOC_NRF9280_CPUAPP || SOC_NRF9280_CPURAD)
+	select NRFS_LOCAL_DOMAIN if SOC_NRF54H20_CPUAPP || \
+				    SOC_NRF54H20_ENGB_CPUAPP || \
+				    SOC_NRF54H20_CPURAD || \
+				    SOC_NRF54H20_ENGB_CPURAD || \
+				    SOC_NRF9280_CPUAPP || \
+				    SOC_NRF9280_CPURAD
 	depends on HAS_NRFS
 	depends on !MISRA_SANE
 	default y if !ZTEST

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -44,6 +44,14 @@ zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUPPR     NRF54H20_XXAA
                                                                 NRF_PPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR    NRF54H20_XXAA
                                                                 NRF_FLPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP NRF54H20_ENGB_XXAA
+                                                                 NRF_APPLICATION)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD NRF54H20_ENGB_XXAA
+                                                                 NRF_RADIOCORE)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR NRF54H20_ENGB_XXAA
+                                                                 NRF_PPR)
+zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR NRF54H20_ENGB_XXAA
+                                                                  NRF_FLPR)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA       NRF54L15_ENGA_XXAA)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP NRF_APPLICATION)
 zephyr_compile_definitions_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR NRF_FLPR)
@@ -95,7 +103,9 @@ zephyr_library_sources_ifdef(CONFIG_SOC_NRF52840       ${MDK_DIR}/system_nrf5284
 zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUAPP ${MDK_DIR}/system_nrf5340_application.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_NRF5340_CPUNET ${MDK_DIR}/system_nrf5340_network.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF54HX ${MDK_DIR}/system_nrf54h.c)
-zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF54LX ${MDK_DIR}/system_nrf54l.c)
+if(CONFIG_SOC_SERIES_NRF54LX OR CONFIG_SOC_SERIES_BSIM_NRF54LX)
+  zephyr_library_sources(${MDK_DIR}/system_nrf54l.c)
+endif()
 zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF91X  ${MDK_DIR}/system_nrf91.c)
 zephyr_library_sources_ifdef(CONFIG_SOC_SERIES_NRF92X  ${MDK_DIR}/system_nrf92.c)
 
@@ -219,6 +229,10 @@ mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUAPP      nrf54h20_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUPPR      nrf54h20_ppr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPUFLPR     nrf54h20_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54H20_CPURAD      nrf54h20_radiocore.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUAPP  nrf54h20_engb_application.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUPPR  nrf54h20_engb_ppr.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPUFLPR nrf54h20_engb_flpr.svd)
+mdk_svd_ifdef(CONFIG_SOC_NRF54H20_ENGB_CPURAD  nrf54h20_engb_radiocore.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUAPP nrf54l15_enga_application.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_ENGA_CPUFLPR nrf54l15_enga_flpr.svd)
 mdk_svd_ifdef(CONFIG_SOC_NRF54L15_CPUAPP      nrf54l15_application.svd)

diff --git a/modules/hal_nordic/nrfx/Kconfig b/modules/hal_nordic/nrfx/Kconfig
@@ -166,8 +166,12 @@ config NRFX_NVMC
 		|| $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF91_FLASH_CONTROLLER))
 
 config NRFX_PDM
-	bool "PDM driver"
-	depends on $(dt_has_compat,$(DT_COMPAT_NORDIC_NRF_PDM))
+	bool
+
+config NRFX_PDM0
+	bool "PDM0 driver instance"
+	depends on $(dt_nodelabel_has_compat,pdm0,$(DT_COMPAT_NORDIC_NRF_PDM))
+	select NRFX_PDM
 
 config NRFX_POWER
 	bool "POWER driver"

diff --git a/modules/hal_nordic/nrfx/nrfx_config.h b/modules/hal_nordic/nrfx/nrfx_config.h
@@ -132,9 +132,6 @@
 #ifdef CONFIG_NRF_GRTC_TIMER_CLOCK_MANAGEMENT
 #define NRF_GRTC_HAS_EXTENDED 1
 #endif
-#ifdef CONFIG_NRF_GRTC_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 1
-#endif
 #ifdef CONFIG_NRF_GRTC_TIMER_AUTO_KEEP_ALIVE
 #define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
@@ -212,6 +209,9 @@
 #ifdef CONFIG_NRFX_PDM
 #define NRFX_PDM_ENABLED 1
 #endif
+#ifdef CONFIG_NRFX_PDM0
+#define NRFX_PDM0_ENABLED 1
+#endif
 #ifdef CONFIG_NRFX_PDM_LOG
 #define NRFX_PDM_CONFIG_LOG_ENABLED 1
 #endif
@@ -1042,15 +1042,15 @@
     #include <nrfx_config_nrf5340_application.h>
 #elif defined(NRF5340_XXAA_NETWORK)
     #include <nrfx_config_nrf5340_network.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_APPLICATION)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54h20_application.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_RADIOCORE)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_RADIOCORE)
     #include <nrfx_config_nrf54h20_radiocore.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_PPR)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_PPR)
     #include <nrfx_config_nrf54h20_ppr.h>
-#elif defined(NRF54H20_XXAA) && defined(NRF_FLPR)
+#elif (defined(NRF54H20_XXAA) || defined(NRF54H20_ENGB_XXAA)) && defined(NRF_FLPR)
     #include <nrfx_config_nrf54h20_flpr.h>
 #elif (defined(NRF54L15_XXAA) || defined(NRF54L15_ENGA_XXAA)) && defined(NRF_APPLICATION)
     #include <nrfx_config_nrf54l15_enga_application.h>
 #elif (defined(NRF54L15_XXAA) || defined(NRF54L15_ENGA_XXAA)) && defined(NRF_FLPR)
    #include <nrfx_config_nrf54l15_enga_flpr.h>