nrfconnect · rlubos · Oct 16, 2024 · Sep 18, 2024 · Oct 9, 2024 · Sep 26, 2024
diff --git a/boards/native/nrf_bsim/CMakeLists.txt b/boards/native/nrf_bsim/CMakeLists.txt
@@ -24,6 +24,7 @@ zephyr_library_sources(
 	cpu_wait.c
 	argparse.c
 	nsi_if.c
+	native_remap.c
 	soc/nrfx_coredep.c
 	common/bstests_entry.c
 	common/cmsis/cmsis.c

diff --git a/boards/native/nrf_bsim/native_remap.c b/boards/native/nrf_bsim/native_remap.c
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include <stdbool.h>
+#include "NHW_misc.h"
+
+bool native_emb_addr_remap(void **addr)
+{
+	return nhw_convert_RAM_addr(addr);
+}
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/include/zephyr/ipc/pbuf.h b/include/zephyr/ipc/pbuf.h
@@ -35,6 +35,13 @@
  */
 #define _PBUF_MIN_DATA_LEN ROUND_UP(PBUF_PACKET_LEN_SZ + 1 + _PBUF_IDX_SIZE, _PBUF_IDX_SIZE)
 
+#if defined(CONFIG_ARCH_POSIX)
+/* For the native simulated boards we need to modify some pointers at init */
+#define PBUF_MAYBE_CONST
+#else
+#define PBUF_MAYBE_CONST const
+#endif
+
 /** @brief Control block of packet buffer.
  *
  * The structure contains configuration data.
@@ -87,9 +94,9 @@
  * written in a way to protect the data from being corrupted.
  */
 struct pbuf {
-	const struct pbuf_cfg *const cfg;	/* Configuration of the
-						 * buffer.
-						 */
+	PBUF_MAYBE_CONST struct pbuf_cfg *const cfg; /* Configuration of the
+						      * buffer.
+						      */
 	struct pbuf_data data;			/* Data used to read and write
 						 * to the buffer
 						 */
@@ -144,17 +151,32 @@
 			"Misaligned memory.");						\
 	BUILD_ASSERT(size >= (MAX(dcache_align, _PBUF_IDX_SIZE) + _PBUF_IDX_SIZE +	\
 			_PBUF_MIN_DATA_LEN), "Insufficient size.");			\
-											\
-	static const struct pbuf_cfg cfg_##name =					\
+	static PBUF_MAYBE_CONST struct pbuf_cfg cfg_##name =				\
 			PBUF_CFG_INIT(mem_addr, size, dcache_align);			\
 	static struct pbuf name = {							\
 		.cfg = &cfg_##name,							\
 	}
 
 /**
- * @brief Initialize the packet buffer.
+ * @brief Initialize the Tx packet buffer.
+ *
+ * This function initializes the Tx packet buffer based on provided configuration.
+ * If the configuration is incorrect, the function will return error.
+ *
+ * It is recommended to use PBUF_DEFINE macro for build time initialization.
+ *
+ * @param pb	Pointer to the packed buffer containing
+ *		configuration and data. Configuration has to be
+ *		fixed before the initialization.
+ * @retval 0 on success.
+ * @retval -EINVAL when the input parameter is incorrect.
+ */
+int pbuf_tx_init(struct pbuf *pb);
+
+/**
+ * @brief Initialize the Rx packet buffer.
  *
- * This function initializes the packet buffer based on provided configuration.
+ * This function initializes the Rx packet buffer.
  * If the configuration is incorrect, the function will return error.
  *
  * It is recommended to use PBUF_DEFINE macro for build time initialization.
@@ -165,7 +187,7 @@
  * @retval 0 on success.
  * @retval -EINVAL when the input parameter is incorrect.
  */
-int pbuf_init(struct pbuf *pb);
+int pbuf_rx_init(struct pbuf *pb);
 
 /**
  * @brief Write specified amount of data to the packet buffer.

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