treewide: Migrate to nRF70 upstream driver

Upstream driver namespace is renamed from nrf700x -> nrf70. Signed-off-by: Chaitanya Tata <[email protected]>
Sriant · Oct 4, 2024 · b364fd8 · b364fd8
1 parent 9952255
commit b364fd8
Show file tree

Hide file tree

Showing 128 changed files with 371 additions and 518 deletions.
diff --git a/applications/asset_tracker_v2/Kconfig.sysbuild b/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

diff --git a/applications/asset_tracker_v2/boards/thingy91x_nrf9151_ns.conf b/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
 

diff --git a/applications/asset_tracker_v2/overlay-nrf7002ek-wifi-scan-only.conf b/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
 

diff --git a/applications/asset_tracker_v2/sample.yaml b/applications/asset_tracker_v2/sample.yaml
@@ -329,7 +329,7 @@ tests:
       - 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
+                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
@@ -338,7 +338,7 @@ tests:
       - 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
+                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
@@ -347,7 +347,7 @@ tests:
       - 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
+                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
@@ -362,7 +362,7 @@ tests:
       - nrf9151dk/nrf9151/ns
     extra_args: SHIELD=nrf7002ek
                 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

diff --git a/applications/matter_bridge/doc/matter_bridge_description.rst b/applications/matter_bridge/doc/matter_bridge_description.rst
@@ -552,7 +552,7 @@ The current maximum number of Bluetooth LE connections that can be selected usin
             .. parsed-literal::
                :class: highlight
 
-               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 -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" -DFILE_SUFFIX=nrf70ek
+               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 -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" -DFILE_SUFFIX=nrf70ek
 
          .. group-tab:: Matter bridge over Thread
 
@@ -576,7 +576,7 @@ The current maximum number of Bluetooth LE connections that can be selected usin
              .. parsed-literal::
                :class: highlight
 
-               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 -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 -p -- -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"
 
          .. group-tab:: Matter bridge over Thread
 
@@ -712,15 +712,14 @@ 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 -DFILE_SUFFIX=nrf70ek
-
+      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 -DFILE_SUFFIX=nrf70ek
 
 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
 =========================
@@ -738,7 +737,17 @@ To enable the Matter smart plugin functionality, run the following command with
 .. parsed-literal::
    :class: highlight
 
-   west build -b *board_target* -p -- -Dmatter_bridge_SNIPPET=onoff_plug
+   .. group-tab:: nRF54 DKs
+
+      .. code-block:: console
+
+         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
+
+      .. code-block:: console
+
+         west build -b nrf7002dk/nrf5340/cpuapp -p -- -DCONFIG_BRIDGED_DEVICE_BT=y -Dmatter_bridge_SNIPPET=onoff_plug
 
 .. _matter_bridge_testing:
 

diff --git a/applications/matter_bridge/sample.yaml b/applications/matter_bridge/sample.yaml
@@ -67,7 +67,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
       FILE_SUFFIX=nrf70ek

diff --git a/applications/matter_weather_station/Kconfig.sysbuild b/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

diff --git a/applications/matter_weather_station/README.rst b/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
 =======================

diff --git a/applications/matter_weather_station/sample.yaml b/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:

diff --git a/boards/nordic/nrf7002dk/Kconfig.sysbuild b/boards/nordic/nrf7002dk/Kconfig.sysbuild
@@ -1,5 +1,5 @@
 # Copyright (c) 2024 Nordic Semiconductor ASA
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
-config WIFI_NRF700X
+config WIFI_NRF70
 	default y if SOC_NRF5340_CPUAPP_QKAA
diff --git a/boards/nordic/thingy91x/CMakeLists.txt b/boards/nordic/thingy91x/CMakeLists.txt
@@ -3,7 +3,7 @@
 # Copyright (c) 2024 Nordic Semiconductor
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 
-if(CONFIG_WIFI_NRF700X)
+if(CONFIG_WIFI_NRF70)
   if(CONFIG_BOARD_THINGY91X_NRF9151 OR CONFIG_BOARD_THINGY91X_NRF9151_NS)
     zephyr_library()
     zephyr_library_sources(nrf70_support.c)

diff --git a/boards/shields/nrf700x_nrf54h20dk/Kconfig.defconfig b/boards/shields/nrf700x_nrf54h20dk/Kconfig.defconfig
@@ -12,7 +12,7 @@ config NETWORKING
 config WIFI
 	default y
 
-config WIFI_NRF700X
+config WIFI_NRF70
 	default y
 
 config NRFX_GPIOTE

diff --git a/boards/shields/nrf700x_nrf54l15dk/Kconfig.defconfig b/boards/shields/nrf700x_nrf54l15dk/Kconfig.defconfig
@@ -12,7 +12,7 @@ config NETWORKING
 config WIFI
 	default y
 
-config WIFI_NRF700X
+config WIFI_NRF70
 	default y
 
 config NRFX_GPIOTE

diff --git a/boards/shields/nrf700x_nrf54l15pdk/Kconfig.defconfig b/boards/shields/nrf700x_nrf54l15pdk/Kconfig.defconfig
@@ -12,7 +12,7 @@ config NETWORKING
 config WIFI
 	default y
 
-config WIFI_NRF700X
+config WIFI_NRF70
 	default y
 
 config NRFX_GPIOTE

diff --git a/cmake/partition_manager.cmake b/cmake/partition_manager.cmake
@@ -519,7 +519,7 @@ if (CONFIG_SECURE_BOOT AND CONFIG_BOOTLOADER_MCUBOOT)
 endif()
 
 # Calculate absolute address for the wi-fi firmware patch location.
-if (CONFIG_WIFI_NRF700X AND CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE)
+if (CONFIG_WIFI_NRF70 AND CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE)
   if(DEFINED ext_flash_dev)
     get_filename_component(qspi_node ${ext_flash_dev} DIRECTORY)
   else()

diff --git a/cmake/sysbuild/nrf700x.cmake b/cmake/sysbuild/nrf700x.cmake
@@ -10,13 +10,13 @@ function(setup_nrf700x_xip_data)
 
   set(OS_AGNOSTIC_BASE ${ZEPHYR_NRFXLIB_MODULE_DIR}/nrf_wifi)
 
-  if(SB_CONFIG_WIFI_NRF700X_SYSTEM_MODE)
+  if(SB_CONFIG_WIFI_NRF70_SYSTEM_MODE)
     set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/default/nrf70.bin)
-  elseif(SB_CONFIG_WIFI_NRF700X_RADIO_TEST)
+  elseif(SB_CONFIG_WIFI_NRF70_RADIO_TEST)
     set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/radio_test/nrf70.bin)
-  elseif(SB_CONFIG_WIFI_NRF700X_SCAN_ONLY)
+  elseif(SB_CONFIG_WIFI_NRF70_SCAN_ONLY)
     set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/scan_only/nrf70.bin)
-  elseif(SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES)
+  elseif(SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES)
     set(NRF70_PATCH ${OS_AGNOSTIC_BASE}/fw_bins/system_with_raw/nrf70.bin)
   else()
     # Error

diff --git a/doc/_scripts/software_maturity/software_maturity_features.yaml b/doc/_scripts/software_maturity/software_maturity_features.yaml
@@ -12,7 +12,7 @@ top_table:
       - BOARD_NRF9151DK_NRF9151_NS
   Matter: CHIP
   Wi-Fi:
-    rule: WIFI && WIFI_NRF700X
+    rule: WIFI && WIFI_NRF70
     boards_and_shields:
       - SHIELD_NRF7002EK
       - SHIELD_NRF7002EK_NRF7000
@@ -67,7 +67,7 @@ features:
     Thread TCP: OPENTHREAD_TCP_ENABLE
   matter:
     Matter over Thread: CHIP && NET_L2_OPENTHREAD
-    Matter over Wi-Fi: CHIP && WIFI_NRF700X
+    Matter over Wi-Fi: CHIP && WIFI_NRF70
     Matter commissioning over IP: CHIP
     Matter commissioning over Bluetooth LE with QR code onboarding: CHIP && BT
     Matter commissioning over Bluetooth LE with NFC onboarding: CHIP && BT && CHIP_NFC_COMMISSIONING
@@ -77,7 +77,7 @@ features:
       NET_L2_OPENTHREAD && OPENTHREAD_MTD_SED
   wifi:
     STA Mode:
-      rule: WPA_SUPP && WIFI_NRF700X
+      rule: WPA_SUPP && WIFI_NRF70
       boards_and_shields:
         - SHIELD_NRF7002EK
         - SHIELD_NRF7002EK_NRF7000
@@ -88,7 +88,7 @@ features:
         - BOARD_NRF7002DK_NRF5340_CPUAPP
         - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     Scan only (for location accuracy):
-      rule: WIFI_NRF700X && !WPA_SUPP
+      rule: WIFI_NRF70 && !WPA_SUPP
       boards_and_shields:
         - SHIELD_NRF7002EK
         - SHIELD_NRF7002EK_NRF7000
@@ -97,19 +97,19 @@ features:
         - BOARD_NRF7002DK_NRF5340_CPUAPP
         - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     Bluetooth LE coexistence:
-      rule: WIFI_NRF700X && NRF700X_SR_COEX
+      rule: WIFI_NRF70 && NRF700X_SR_COEX
       boards_and_shields:
         - SHIELD_NRF7002EK
         - SHIELD_NRF7002EK_NRF7001
         - SHIELD_NRF7002EB
         - BOARD_NRF7002DK_NRF5340_CPUAPP
         - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     Thread coexistence:
-      rule: WIFI_NRF700X && OPENTHREAD
+      rule: WIFI_NRF70 && OPENTHREAD
       boards_and_shields:
         - BOARD_NRF7002DK_NRF5340_CPUAPP
     SoftAP Mode (for Wi-Fi provisioning):
-      rule: WIFI_NRF700X && NRF700X_AP_MODE && WPA_SUPP_AP
+      rule: WIFI_NRF70 && NRF700X_AP_MODE && WPA_SUPP_AP
       boards_and_shields:
         - SHIELD_NRF7002EK
         - SHIELD_NRF7002EK_NRF7000
@@ -118,7 +118,7 @@ features:
         - BOARD_NRF7002DK_NRF5340_CPUAPP
         - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     Monitor Mode:
-      rule: WIFI_NRF700X && NRF700X_RAW_DATA_RX
+      rule: WIFI_NRF70 && NRF700X_RAW_DATA_RX
       boards_and_shields:
         - SHIELD_NRF7002EK
         - SHIELD_NRF7002EK_NRF7000
@@ -127,7 +127,7 @@ features:
         - BOARD_NRF7002DK_NRF5340_CPUAPP
         - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     TX injection Mode:
-      rule: WIFI_NRF700X && NRF700X_RAW_DATA_TX
+      rule: WIFI_NRF70 && NRF700X_RAW_DATA_TX
       boards_and_shields:
         - SHIELD_NRF7002EK
         - SHIELD_NRF7002EK_NRF7000
@@ -136,7 +136,7 @@ features:
         - BOARD_NRF7002DK_NRF5340_CPUAPP
         - BOARD_NRF7002DK_NRF5340_CPUAPP_NRF7001
     Promiscuous Mode:
-      rule: WIFI_NRF700X && NRF700X_PROMISC_DATA_RX
+      rule: WIFI_NRF70 && NRF700X_PROMISC_DATA_RX
       boards_and_shields:
         - SHIELD_NRF7002EK
         - SHIELD_NRF7002EK_NRF7001

diff --git a/doc/_scripts/software_maturity/software_maturity_scanner.py b/doc/_scripts/software_maturity/software_maturity_scanner.py
@@ -59,7 +59,7 @@
             Matter over Thread: CHIP && NET_L2_OPENTHREAD
         wifi:
             STA Mode:
-                rule: WPA_SUPP && WIFI_NRF700X
+                rule: WPA_SUPP && WIFI_NRF70
                 boards_and_shields:
                   - SHIELD_NRF7002EK
                   - BOARD_NRF7002DK_NRF5340_CPUAPP

diff --git a/doc/nrf/app_dev/config_and_build/sysbuild/sysbuild_forced_options.rst b/doc/nrf/app_dev/config_and_build/sysbuild/sysbuild_forced_options.rst
@@ -18,21 +18,21 @@ Trying to change them directly in an image will result in the new value being ov
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+-------------------------+
 | :kconfig:option:`CONFIG_BT_FAST_PAIR`                                   +               ``SB_CONFIG_BT_FAST_PAIR``                                  | Main application        |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |
-| :kconfig:option:`CONFIG_WIFI_NRF700X`                                   +               ``SB_CONFIG_WIFI_NRF700X``                                  |                         |
+| :kconfig:option:`CONFIG_WIFI_NRF70`                                     +               ``SB_CONFIG_WIFI_NRF70``                                    |                         |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |
 | :kconfig:option:`CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_DISABLED`            +               ``SB_CONFIG_WIFI_PATCHES_EXT_FLASH_DISABLED``               |                         |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |
 | :kconfig:option:`CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_XIP`                 +               ``SB_CONFIG_WIFI_PATCHES_EXT_FLASH_XIP``                    |                         |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |
 | :kconfig:option:`CONFIG_NRF_WIFI_PATCHES_EXT_FLASH_STORE`               +               ``SB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE``                  |                         |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |
-| :kconfig:option:`CONFIG_NRF700X_SYSTEM_MODE`                            +               ``SB_CONFIG_WIFI_NRF700X_SYSTEM_MODE``                      |                         |
+| :kconfig:option:`CONFIG_NRF70_SYSTEM_MODE`                              +               ``SB_CONFIG_WIFI_NRF70_SYSTEM_MODE``                        |                         |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |
-| :kconfig:option:`CONFIG_NRF700X_SCAN_ONLY`                              +               ``SB_CONFIG_WIFI_NRF700X_SCAN_ONLY``                        |                         |
+| :kconfig:option:`CONFIG_NRF70_SCAN_ONLY`                                +               ``SB_CONFIG_WIFI_NRF70_SCAN_ONLY``                          |                         |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |
-| :kconfig:option:`CONFIG_NRF700X_RADIO_TEST`                             +               ``SB_CONFIG_WIFI_NRF700X_RADIO_TEST``                       |                         |
+| :kconfig:option:`CONFIG_NRF70_RADIO_TEST`                               +               ``SB_CONFIG_WIFI_NRF70_RADIO_TEST``                         |                         |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |
-| :kconfig:option:`CONFIG_NRF700X_SYSTEM_WITH_RAW_MODES`                  +               ``SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES``            |                         |
+| :kconfig:option:`CONFIG_NRF70_SYSTEM_WITH_RAW_MODES`                    +               ``SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES``              |                         |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |
 | :kconfig:option:`CONFIG_NRF_WIFI_FW_PATCH_DFU`                          +               ``SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH``         |                         |
 +-------------------------------------------------------------------------+---------------------------------------------------------------------------+                         |

diff --git a/doc/nrf/drivers.rst b/doc/nrf/drivers.rst
@@ -16,4 +16,3 @@ Here you can find documentation for drivers in the |NCS|, including API document
    :glob:
 
    drivers/*
-   drivers/wifi/nrf700x/*
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,3 @@ Here you can find documentation for drivers in the \|NCS\|, including API document
		:glob:

		drivers/*
		drivers/wifi/nrf700x/*