wifi: Pull nRF70 upstream support

MAINTAINERS.yml

@@ -1951,6 +1951,29 @@ Release Notes:
   labels:
     - "area: Wi-Fi"
 
+"Drivers: Wi-Fi as nRF Wi-Fi":
+  status: maintained
+  maintainers:
+    - krish2718
+    - jukkar
+  collaborators:
+    - sachinthegreen
+  files:
+    - drivers/wifi/nrfwifi/
+    - dts/bindings/wifi/nordic,nrf70.yaml
+    - dts/bindings/wifi/nordic,nrf70-qspi.yaml
+    - dts/bindings/wifi/nordic,nrf70-spi.yaml
+    - dts/bindings/wifi/nordic,nrf70-coex.yaml
+    - dts/bindings/wifi/nordic,nrf7002-qspi.yaml
+    - dts/bindings/wifi/nordic,nrf7002-spi.yaml
+    - dts/bindings/wifi/nordic,nrf7000-qspi.yaml
+    - dts/bindings/wifi/nordic,nrf7000-spi.yaml
+    - dts/bindings/wifi/nordic,nrf7001-qspi.yaml
+    - dts/bindings/wifi/nordic,nrf7001-spi.yaml
+    - boards/shields/nrf7002ek/
+  labels:
+    - "area: Wi-Fi"
+
 "Drivers: Memory Management":
   status: maintained
   maintainers:
@@ -4315,6 +4338,11 @@ West:
   collaborators:
     - hubertmis
     - nordic-krch
+    - krish2718
+    - sachinthegreen
+    - udaynordic
+    - rajb9
+    - srkanordic
   files:
     - modules/hal_nordic/
   labels:

boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.yaml

@@ -22,3 +22,7 @@ supported:
   - spi
   - watchdog
   - usbd
+testing:
+  default: true
+  ignore_tags:
+    - ci_samples_wifi

boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp.yaml

@@ -21,3 +21,7 @@ supported:
   - spi
   - watchdog
   - i2s
+testing:
+  default: true
+  ignore_tags:
+    - ci_samples_wifi

boards/nordic/nrf54l15pdk/nrf54l15pdk_nrf54l15_cpuapp_ns.yaml

@@ -20,3 +20,7 @@ supported:
   - watchdog
   - adc
   - i2s
+testing:
+  default: true
+  ignore_tags:
+    - ci_samples_wifi

boards/nordic/nrf7002dk/CMakeLists.txt

@@ -0,0 +1,11 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if((CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+    CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS) AND
+   CONFIG_BOARD_ENABLE_CPUNET)
+  zephyr_library()
+  zephyr_library_sources(nrf5340_cpunet_reset.c)
+endif()

boards/nordic/nrf7002dk/Kconfig

@@ -0,0 +1,71 @@
+# nRF5340 DK board configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config IPM_NRFX
+	default IPM
+
+config MBOX_NRFX_IPC
+	default MBOX
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+config BT_HCI_IPC
+	default y if BT
+
+config HEAP_MEM_POOL_ADD_SIZE_BOARD
+	int
+	default 4096 if BT_HCI_IPC
+
+config BOARD_ENABLE_CPUNET
+	bool "nRF53 Network MCU"
+	select SOC_NRF_GPIO_FORWARDER_FOR_NRF5340 if \
+		$(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_GPIO_FORWARDER))
+	help
+	  This option enables releasing the Network 'force off' signal, which
+	  as a consequence will power up the Network MCU during system boot.
+	  Additionally, the option allocates GPIO pins that will be used by UARTE
+	  of the Network MCU.
+	  Note: GPIO pin allocation can only be configured by the secure Application
+	  MCU firmware, so when this option is used with the non-secure version of
+	  the board, the application needs to take into consideration, that the
+	  secure firmware image must already have configured GPIO allocation for the
+	  Network MCU.
+	default y if (BT || NRF_802154_SER_HOST)
+
+config DOMAIN_CPUNET_BOARD
+	string
+	default "nrf7002dk/nrf5340/cpunet"
+	depends on BOARD_ENABLE_CPUNET
+	help
+	  The board which will be used for CPUNET domain when creating a multi
+	  image application where one or more images should be located on
+	  another board. For example hci_ipc on the nRF5340_cpunet for
+	  Bluetooth applications.
+
+endif
+
+if BOARD_NRF7002DK_NRF5340_CPUNET
+
+config BT_CTLR
+	default y if BT
+
+config BT_ECC
+	default y if BT
+
+config DOMAIN_CPUAPP_BOARD
+	string
+	default "nrf7002dk/nrf5340/cpuapp" if BOARD_NRF7002DK_NRF5340_CPUAPP
+	default "nrf7002dk/nrf5340/cpuapp/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NS
+	default "nrf7002dk/nrf5340/cpuapp/nrf7001" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
+	default "nrf7002dk/nrf5340/cpuapp/nrf7001/ns" if BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+	help
+	  The board which will be used for CPUAPP domain when creating a multi
+	  image application where one or more images should be located on
+	  another board.
+
+endif

boards/nordic/nrf7002dk/Kconfig.defconfig

@@ -0,0 +1,76 @@
+# nRF5340 DK nRF5340 board configuration
+
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+	BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+# By default, if we build for a Non-Secure version of the board,
+# force building with TF-M as the Secure Execution Environment.
+config BUILD_WITH_TFM
+	default y if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+		     BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+if BUILD_WITH_TFM
+
+# By default, if we build with TF-M, instruct build system to
+# flash the combined TF-M (Secure) & Zephyr (Non Secure) image
+config TFM_FLASH_MERGED_BINARY
+	bool
+	default y
+
+endif # BUILD_WITH_TFM
+
+# Code Partition:
+#
+# For the secure version of the board the firmware is linked at the beginning
+# of the flash, or into the code-partition defined in DT if it is intended to
+# be loaded by MCUboot. If the secure firmware is to be combined with a non-
+# secure image (TRUSTED_EXECUTION_SECURE=y), the secure FW image shall always
+# be restricted to the size of its code partition.
+#
+# For the non-secure version of the board, the firmware
+# must be linked into the code-partition (non-secure) defined in DT, regardless.
+# Apply this configuration below by setting the Kconfig symbols used by
+# the linker according to the information extracted from DT partitions.
+
+# SRAM Partition:
+#
+# If the secure firmware is to be combined with a non-secure image
+# (TRUSTED_EXECUTION_SECURE=y), the secure FW image SRAM shall always
+# be restricted to the secure image SRAM partition (sram-secure-partition).
+# Otherwise (if TRUSTED_EXECUTION_SECURE is not set) the whole zephyr,sram
+# may be used by the image.
+#
+# For the non-secure version of the board, the firmware image SRAM is
+# always restricted to the allocated non-secure SRAM partition.
+#
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition
+DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition
+
+if (BOARD_NRF7002DK_NRF5340_CPUAPP || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001) && \
+	TRUSTED_EXECUTION_SECURE
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config SRAM_SIZE
+	default $(dt_chosen_reg_size_int,$(DT_CHOSEN_Z_SRAM_PARTITION),0,K)
+
+endif
+
+if BOARD_NRF7002DK_NRF5340_CPUAPP_NS || BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS
+
+config FLASH_LOAD_OFFSET
+	default $(dt_chosen_reg_addr_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+config FLASH_LOAD_SIZE
+	default $(dt_chosen_reg_size_hex,$(DT_CHOSEN_Z_CODE_PARTITION))
+
+endif
+
+endif

boards/nordic/nrf7002dk/Kconfig.nrf7002dk

@@ -0,0 +1,9 @@
+# Copyright (c) 2024 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_NRF7002DK
+	select SOC_NRF5340_CPUNET_QKAA if BOARD_NRF7002DK_NRF5340_CPUNET
+	select SOC_NRF5340_CPUAPP_QKAA if BOARD_NRF7002DK_NRF5340_CPUAPP || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NS || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 || \
+					  BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS

boards/nordic/nrf7002dk/board.cmake

@@ -0,0 +1,25 @@
+# Copyright (c) 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
+  set(TFM_PUBLIC_KEY_FORMAT "full")
+endif()
+
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NS OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001 OR
+   CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001_NS)
+  board_runner_args(jlink "--device=nrf5340_xxaa_app" "--speed=4000")
+endif()
+
+if(CONFIG_TFM_FLASH_MERGED_BINARY)
+  set_property(TARGET runners_yaml_props_target PROPERTY hex_file "${CMAKE_BINARY_DIR}/zephyr/tfm_merged.hex")
+endif()
+
+if(CONFIG_BOARD_NRF7002DK_NRF5340_CPUNET)
+  board_runner_args(jlink "--device=nrf5340_xxaa_net" "--speed=4000")
+endif()
+
+include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)

boards/nordic/nrf7002dk/board.yml

@@ -0,0 +1,12 @@
+board:
+  name: nrf7002dk
+  vendor: nordic
+  socs:
+    - name: nrf5340
+      variants:
+        - name: ns
+          cpucluster: cpuapp
+        - name: nrf7001
+          cpucluster: cpuapp
+          variants:
+            - name: ns