[nrf fromtree] modules: hal_nordic: add support for nRF54H20 EngB

Add support for nRF54H20 EngB in the Nordic HAL glue code.

Signed-off-by: Gerard Marull-Paretas <[email protected]>
(cherry picked from commit 40f5ca0)

Author: gmarull

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)
@@ -221,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)

modules/hal_nordic/nrfx/nrfx_config.h

@@ -1042,13 +1042,13 @@
     #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>

modules/hal_nordic/nrfx/nrfx_config_nrf54h20_application.h

@@ -11,6 +11,7 @@
 #error "This file should not be included directly. Include nrfx_config.h instead."
 #endif
 
+
 /**
  * @brief NRFX_DEFAULT_IRQ_PRIORITY
  *
@@ -358,30 +359,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
 #endif
 
 /**

modules/hal_nordic/nrfx/nrfx_config_nrf54h20_flpr.h

@@ -254,30 +254,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
 #endif
 
 /**
@@ -1619,6 +1619,15 @@
 #define NRFX_UARTE_CONFIG_RX_CACHE_ENABLED 1
 #endif
 
+/**
+ * @brief NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+ *
+ * Integer value. Minimum: 0. Maximum: 255.
+ */
+#ifndef NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE
+#define NRFX_UARTE_RX_FIFO_FLUSH_WORKAROUND_MAGIC_BYTE 171
+#endif
+
 /**
  * @brief NRFX_UARTE_DEFAULT_CONFIG_IRQ_PRIORITY
  *

modules/hal_nordic/nrfx/nrfx_config_nrf54h20_ppr.h

@@ -11,6 +11,7 @@
 #error "This file should not be included directly. Include nrfx_config.h instead."
 #endif
 
+
 /**
  * @brief NRFX_DEFAULT_IRQ_PRIORITY
  *
@@ -62,6 +63,15 @@
 #define NRFX_COMP_CONFIG_LOG_LEVEL 3
 #endif
 
+/**
+ * @brief NRFX_COREDEP_VPR_LEGACY
+ *
+ * Boolean. Accepted values: 0 and 1.
+ */
+#ifndef NRFX_COREDEP_VPR_LEGACY
+#define NRFX_COREDEP_VPR_LEGACY 0
+#endif
+
 /**
  * @brief NRFX_DPPI_ENABLED
  *
@@ -304,30 +314,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
 #endif
 
 /**

modules/hal_nordic/nrfx/nrfx_config_nrf54h20_radiocore.h

@@ -395,30 +395,30 @@
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_SLEEP_ALLOWED
+ * @brief NRFX_GRTC_CONFIG_AUTOEN
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_SLEEP_ALLOWED
-#define NRFX_GRTC_CONFIG_SLEEP_ALLOWED 0
+#ifndef NRFX_GRTC_CONFIG_AUTOEN
+#define NRFX_GRTC_CONFIG_AUTOEN 1
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOEN
+ * @brief NRFX_GRTC_CONFIG_AUTOSTART
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOEN
-#define NRFX_GRTC_CONFIG_AUTOEN 0
+#ifndef NRFX_GRTC_CONFIG_AUTOSTART
+#define NRFX_GRTC_CONFIG_AUTOSTART 0
 #endif
 
 /**
- * @brief NRFX_GRTC_CONFIG_AUTOSTART
+ * @brief NRFX_GRTC_CONFIG_CLEAR_AT_INIT
  *
  * Boolean. Accepted values: 0 and 1.
  */
-#ifndef NRFX_GRTC_CONFIG_AUTOSTART
-#define NRFX_GRTC_CONFIG_AUTOSTART 0
+#ifndef NRFX_GRTC_CONFIG_CLEAR_AT_INIT
+#define NRFX_GRTC_CONFIG_CLEAR_AT_INIT 0
 #endif
 
 /**