wifi: Migrate to nRF70 upstream

CODEOWNERS

@@ -90,7 +90,6 @@ Kconfig*                                  @tejlmand
 /drivers/sensor/bme68x_iaq/               @nrfconnect/ncs-cia
 /drivers/sensor/paw3212/                  @anangl @pdunaj @MarekPieta
 /drivers/sensor/pmw3360/                  @anangl @pdunaj @MarekPieta
-/drivers/wifi/nrf700x/                    @krish2718 @sachinthegreen @rado17 @rlubos
 /dts/                                     @anangl
 /ext/                                     @carlescufi
 /include/                                 @anangl @rlubos
@@ -157,7 +156,6 @@ Kconfig*                                  @tejlmand
 /lib/sample_rate_converter/               @nrfconnect/ncs-audio
 /lib/tone/                                @nrfconnect/ncs-audio
 /modules/                                 @tejlmand
-/modules/hostap/                          @krish2718 @jukkar @rado17 @sachinthegreen @rlubos
 /modules/mcuboot/                         @de-nordic @nordicjm
 /modules/cjson/                           @nrfconnect/ncs-cia @plskeggs @sigvartmh
 /modules/trusted-firmware-m/              @frkv @Vge0rge @vili-nordic

applications/asset_tracker_v2/Kconfig.sysbuild

@@ -13,7 +13,7 @@ config SECURE_BOOT_APPCORE
 		|| BOARD_NRF9151DK_NRF9151_NS \
 		|| BOARD_NRF9161DK_NRF9161_NS
 
-config WIFI_NRF700X
+config WIFI_NRF70
 	default y if BOARD_THINGY91X_NRF9151_NS
 
 config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY

applications/asset_tracker_v2/boards/thingy91x_nrf9151_ns.conf

@@ -30,8 +30,8 @@ CONFIG_ADXL367_ACTIVITY_TIME=0
 
 # configs for Wi-Fi
 CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WIFI_NRF700X_SKIP_LOCAL_ADMIN_MAC=y
+CONFIG_WIFI_NRF70=y
+CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC=y
 # Align this with CONFIG_LOCATION_METHOD_WIFI_SCANNING_RESULTS_MAX_CNT
 CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT=10
 
@@ -50,7 +50,7 @@ CONFIG_NRF_MODEM_LIB_SHMEM_TX_SIZE=4096
 CONFIG_NRF_MODEM_LIB_SHMEM_RX_SIZE=4096
 
 # Scan only using offload API
-CONFIG_WPA_SUPP=n
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
 
 # For nRF9160 the default is socket interface
 CONFIG_NET_DEFAULT_IF_ETHERNET=y

applications/asset_tracker_v2/overlay-nrf7002ek-wifi-scan-only.conf

@@ -19,8 +19,8 @@ CONFIG_DK_LIBRARY=n
 
 # Actual configs for the Wi-Fi
 CONFIG_WIFI=y
-CONFIG_WIFI_NRF700X=y
-CONFIG_WIFI_NRF700X_SKIP_LOCAL_ADMIN_MAC=y
+CONFIG_WIFI_NRF70=y
+CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC=y
 # Align this with CONFIG_LOCATION_METHOD_WIFI_SCANNING_RESULTS_MAX_CNT
 CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT=20
 
@@ -35,13 +35,14 @@ CONFIG_LOCATION_METHOD_WIFI_SCANNING_RESULTS_MAX_CNT=20
 CONFIG_LOCATION_WORKQUEUE_STACK_SIZE=8192
 # Needed to handle more scan results
 CONFIG_HEAP_MEM_POOL_SIZE=60000
+CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y
 
 # Not for LTE throughput testing
 CONFIG_NRF_MODEM_LIB_SHMEM_TX_SIZE=4096
 CONFIG_NRF_MODEM_LIB_SHMEM_RX_SIZE=4096
 
 # Scan only using offload API
-CONFIG_WPA_SUPP=n
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
 
 # For nRF9160 the default is socket interface
 CONFIG_NET_DEFAULT_IF_ETHERNET=y

applications/asset_tracker_v2/sample.yaml

@@ -328,26 +328,26 @@ tests:
     integration_platforms:
       - nrf9160dk/nrf9160/ns
     platform_allow: nrf9160dk/nrf9160/ns
-    extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
-                SB_CONFIG_WIFI_NRF700X=y SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y
+    extra_args: SHIELD=nrf7002ek_nrf7000 EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
+                SB_CONFIG_WIFI_NRF70=y SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y
     tags: ci_build sysbuild ci_applications_asset_tracker_v2
   applications.asset_tracker_v2.nrf7002ek_wifi.nrf9161dk:
     sysbuild: true
     build_only: true
     integration_platforms:
       - nrf9161dk/nrf9161/ns
     platform_allow: nrf9161dk/nrf9161/ns
-    extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
-                SB_CONFIG_WIFI_NRF700X=y SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y
+    extra_args: SHIELD=nrf7002ek_nrf7000 EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
+                SB_CONFIG_WIFI_NRF70=y SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y
     tags: ci_build sysbuild ci_applications_asset_tracker_v2
   applications.asset_tracker_v2.nrf7002ek_wifi.nrf9151dk:
     sysbuild: true
     build_only: true
     integration_platforms:
       - nrf9151dk/nrf9151/ns
     platform_allow: nrf9151dk/nrf9151/ns
-    extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
-                SB_CONFIG_WIFI_NRF700X=y SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y
+    extra_args: SHIELD=nrf7002ek_nrf7000 EXTRA_CONF_FILE=overlay-nrf7002ek-wifi-scan-only.conf
+                SB_CONFIG_WIFI_NRF70=y SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y
     tags: ci_build sysbuild ci_applications_asset_tracker_v2
   applications.asset_tracker_v2.nrf7002ek_wifi-debug:
     sysbuild: true
@@ -360,9 +360,9 @@ tests:
       - nrf9160dk/nrf9160/ns
       - nrf9161dk/nrf9161/ns
       - nrf9151dk/nrf9151/ns
-    extra_args: SHIELD=nrf7002ek
+    extra_args: SHIELD=nrf7002ek_nrf7000
                 EXTRA_CONF_FILE="overlay-nrf7002ek-wifi-scan-only.conf;overlay-debug.conf"
-                SB_CONFIG_WIFI_NRF700X=y SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y
+                SB_CONFIG_WIFI_NRF70=y SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y
     tags: ci_build sysbuild ci_applications_asset_tracker_v2
 
   # Configuration which will be used by the positioning CI integration job to verify PRs

applications/matter_bridge/doc/matter_bridge_description.rst

@@ -543,7 +543,7 @@ Build the target using the following command in the project directory to enable
 .. parsed-literal::
    :class: highlight
 
-   west build -b nrf54h20dk/nrf54h20/cpuapp -- -DSB_CONFIG_WIFI_NRF700X=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf700x_nrf54h20dk -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="overlay-bt_max_connections_app.conf" -Dipc_radio_EXTRA_CONF_FILE="overlay-bt_max_connections_net.conf"
+   west build -b nrf54h20dk/nrf54h20/cpuapp -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf700x_nrf54h20dk -DCONFIG_BRIDGED_DEVICE_BT=y -DEXTRA_CONF_FILE="overlay-bt_max_connections_app.conf" -Dipc_radio_EXTRA_CONF_FILE="overlay-bt_max_connections_net.conf"
 
 .. _matter_bridge_app_bt_security:
 
@@ -627,15 +627,15 @@ For example:
 
    .. code-block:: console
 
-      west build -b nrf5340dk/nrf5340/cpuapp -p -- -Dmatter_bridge_SHIELD=nrf7002ek -DSB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE=y -DSB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y -DSB_CONFIG_WIFI_NRF700X=y -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3
+      west build -b nrf5340dk/nrf5340/cpuapp -p -- -Dmatter_bridge_SHIELD=nrf7002ek -DSB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE=y -DSB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y -DSB_CONFIG_WIFI_NRF70=y -Dmcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3
 
 
 To use the nRF54H20 DK with the ``nrf7002ek`` shield (2.4 GHz or 5 GHz), follow the :ref:`ug_nrf7002eb_nrf54h20dk_gs` user guide to connect all required pins.
 Once connected, run the following command to build the sample:
 
    .. code-block:: console
 
-      west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF700X=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf700x_nrf54h20dk
+      west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf700x_nrf54h20dk
 
 Selecting a configuration
 =========================
@@ -656,7 +656,7 @@ To enable the Matter smart plug functionality, run the following command:
 
       .. code-block:: console
 
-         west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF700X=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf700x_nrf54h20dk -DCONFIG_BRIDGED_DEVICE_BT=y -Dmatter_bridge_SNIPPET=onoff_plug
+         west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dmatter_bridge_SHIELD=nrf700x_nrf54h20dk -DCONFIG_BRIDGED_DEVICE_BT=y -Dmatter_bridge_SNIPPET=onoff_plug
 
    .. group-tab:: nRF70 DKs
 

applications/matter_bridge/sample.yaml

@@ -55,7 +55,7 @@ tests:
     sysbuild: true
     build_only: true
     extra_args: matter_bridge_SHIELD=nrf7002ek SB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE=y
-      mcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 SB_CONFIG_WIFI_NRF700X=y
+      mcuboot_CONFIG_UPDATEABLE_IMAGE_NUMBER=3 SB_CONFIG_WIFI_NRF70=y
       SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y
       CONFIG_CHIP_DFU_OVER_BT_SMP=y
     integration_platforms:
@@ -75,7 +75,7 @@ tests:
   applications.matter_bridge.nrf54h20.br_ble:
     sysbuild: true
     build_only: true
-    extra_args: SB_CONFIG_WIFI_NRF700X=y
+    extra_args: SB_CONFIG_WIFI_NRF70=y
       CONFIG_CHIP_WIFI=y
       matter_bridge_SHIELD=nrf700x_nrf54h20dk
       CONFIG_BRIDGED_DEVICE_BT=y
@@ -86,7 +86,7 @@ tests:
   applications.matter_bridge.nrf54h20:
     sysbuild: true
     build_only: true
-    extra_args: SB_CONFIG_WIFI_NRF700X=y
+    extra_args: SB_CONFIG_WIFI_NRF70=y
       CONFIG_CHIP_WIFI=y
       matter_bridge_SHIELD=nrf700x_nrf54h20dk
       CONFIG_BRIDGED_DEVICE_SIMULATED=y
@@ -97,7 +97,7 @@ tests:
   applications.matter_bridge.nrf54h20.br_ble.smart_plug:
     sysbuild: true
     build_only: true
-    extra_args: SB_CONFIG_WIFI_NRF700X=y
+    extra_args: SB_CONFIG_WIFI_NRF70=y
       CONFIG_CHIP_WIFI=y
       matter_bridge_SHIELD=nrf700x_nrf54h20dk
       CONFIG_BRIDGED_DEVICE_BT=y
@@ -109,7 +109,7 @@ tests:
   applications.matter_bridge.nrf54h20.smart_plug:
     sysbuild: true
     build_only: true
-    extra_args: SB_CONFIG_WIFI_NRF700X=y
+    extra_args: SB_CONFIG_WIFI_NRF70=y
       CONFIG_CHIP_WIFI=y
       matter_bridge_SHIELD=nrf700x_nrf54h20dk
       CONFIG_BRIDGED_DEVICE_SIMULATED=y

applications/matter_weather_station/Kconfig.sysbuild

@@ -11,7 +11,7 @@ config NRF_DEFAULT_IPC_RADIO
 # Enable IEEE802.15.4 serialization to network core
 # This config automatically pulls in the `overlay-802154.conf` in the ipc_radio image
 config NETCORE_IPC_RADIO_IEEE802154
-	default y if !WIFI_NRF700X
+	default y if !WIFI_NRF70
 
 # Enable Bluetooth serialization to network core
 # This config automatically pulls in the `overlay-bt_hci_ipc.conf` in the ipc_radio image

applications/matter_weather_station/README.rst

@@ -210,15 +210,15 @@ To build this application to work with the nRF7002 Wi-Fi expansion board:
       .. group-tab:: nRF Connect for VS Code
 
          To build the application in the nRF Connect for VS Code IDE for Thingy:53 with the nRF7002 EB attached, add the expansion board and the file suffix variables in the build configuration's :guilabel:`Extra CMake arguments` and rebuild the build configuration.
-         For example: ``-- -Dmatter_weather_station_SHIELD=nrf7002eb -DFILE_SUFFIX=release -DSB_CONFIG_WIFI_NRF700X=y``.
+         For example: ``-- -Dmatter_weather_station_SHIELD=nrf7002eb -DFILE_SUFFIX=release -DSB_CONFIG_WIFI_NRF70=y``.
 
       .. group-tab:: Command line
 
          To build the sample from the command line for Thingy:53 with the nRF7002 EB attached, use the following command within the sample directory:
 
          .. code-block:: console
 
-            west build -b thingy53/nrf5340/cpuapp -- -Dmatter_weather_station_SHIELD=nrf7002eb -DFILE_SUFFIX=release -DSB_CONFIG_WIFI_NRF700X=y
+            west build -b thingy53/nrf5340/cpuapp -- -Dmatter_weather_station_SHIELD=nrf7002eb -DFILE_SUFFIX=release -DSB_CONFIG_WIFI_NRF70=y
 
 Generating factory data
 =======================

applications/matter_weather_station/sample.yaml

@@ -50,7 +50,7 @@ tests:
     sysbuild: true
     build_only: true
     extra_args: matter_weather_station_SHIELD=nrf7002eb FILE_SUFFIX=release
-                SB_CONFIG_WIFI_NRF700X=y CONFIG_CHIP_WIFI=y
+                SB_CONFIG_WIFI_NRF70=y CONFIG_CHIP_WIFI=y
     platform_allow: thingy53/nrf5340/cpuapp
     platform_exclude: thingy53/nrf5340/cpuapp/ns
     integration_platforms: