nrfconnect · plskeggs · Aug 13, 2024 · Sep 23, 2024 · Sep 4, 2024 · Sep 5, 2024
@@ -29,7 +29,7 @@ jobs:
         pip3 install -U pip
         pip3 install -U setuptools
         pip3 install -U wheel
-        grep -E "^python-magic|^junitparser|^lxml|^gitlint|^pylint|^pykwalify|^yamllint" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
+        grep -E "^python-magic|^junitparser|^lxml|^gitlint|^pylint|^pykwalify|^yamllint|^unidiff" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
         grep -E "^west" scripts/requirements-fixed.txt | cut -d ' ' -f '1' | xargs pip3 install -U
         pip3 show -f west
 

@@ -70,7 +70,6 @@
 /drivers/sensor/bme68x_iaq/               @nrfconnect/ncs-co-drivers @nrfconnect/ncs-cia
 /drivers/sensor/paw3212/                  @nrfconnect/ncs-co-drivers @nrfconnect/ncs-si-bluebagel
 /drivers/sensor/pmw3360/                  @nrfconnect/ncs-co-drivers @nrfconnect/ncs-si-bluebagel
-/drivers/wifi/nrf700x/                    @nrfconnect/ncs-co-networking @krish2718 @sachinthegreen @rado17
 
 # Devicetree
 /dts/                                     @nrfconnect/ncs-co-drivers
@@ -157,7 +156,6 @@
 
 # Modules
 /modules/                                 @nrfconnect/ncs-co-build-system
-/modules/hostap/                          @nrfconnect/ncs-co-networking @krish2718 @rado17 @sachinthegreen
 /modules/mcuboot/                         @nrfconnect/ncs-pluto
 /modules/cjson/                           @nrfconnect/ncs-cia @plskeggs
 /modules/trusted-firmware-m/              @nrfconnect/ncs-aegir

@@ -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

@@ -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

@@ -36,7 +36,7 @@ The following table lists the sensors and sensor data types supported by the mod
 | Acceleration (Impact)   | `ADXL372`_      |
 +-------------------------+-----------------+
 
-The module controls and collects data from the sensors by interacting with their :ref:`device drivers <device_model_api>` using :ref:`Zephyr's generic sensor API <sensor_api>`.
+The module controls and collects data from the sensors by interacting with their :ref:`device drivers <device_model_api>` using :ref:`Zephyr's generic sensor API <sensor>`.
 
 Thingy:91 X has a `BME688`_ gas sensor and `ADXL367`_ motion sensor that can be used by the :ref:`asset_tracker_v2_sensor_module` module.
 
@@ -189,7 +189,7 @@ Dependencies
 
 This module uses the following Zephyr API:
 
-* :ref:`Generic sensor API <sensor_api>`
+* :ref:`Generic sensor API <sensor>`
 
 API documentation
 *****************

@@ -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

@@ -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

@@ -10,7 +10,7 @@
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/usb/bos.h>
 #include <zephyr/usb/msos_desc.h>
-#include <zephyr/net/buf.h>
+#include <zephyr/net_buf.h>
 #include <usb_descriptor.h>
 
 #define MODULE bulk_interface

@@ -13,7 +13,7 @@
 
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
-#include <zephyr/net/buf.h>
+#include <zephyr/net_buf.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/bluetooth/l2cap.h>
@@ -88,7 +88,7 @@ static void recv_cmd(const uint8_t *data, size_t len)
 						sys_le16_to_cpu(hdr->opcode), hdr->param_len);
 
 	net_buf_add_mem(buf, data, len);
-	net_buf_put(&tx_queue, buf);
+	k_fifo_put(&tx_queue, buf);
 }
 
 static void recv_acl(const uint8_t *data, size_t len)
@@ -125,7 +125,7 @@ static void recv_acl(const uint8_t *data, size_t len)
 					sys_le16_to_cpu(hdr->handle), sys_le16_to_cpu(hdr->len));
 
 	net_buf_add_mem(buf, data, len);
-	net_buf_put(&tx_queue, buf);
+	k_fifo_put(&tx_queue, buf);
 }
 
 static void recv_iso(const uint8_t *data, size_t len)
@@ -162,7 +162,7 @@ static void recv_iso(const uint8_t *data, size_t len)
 					sys_le16_to_cpu(hdr->handle), sys_le16_to_cpu(hdr->len));
 
 	net_buf_add_mem(buf, data, len);
-	net_buf_put(&tx_queue, buf);
+	k_fifo_put(&tx_queue, buf);
 }
 
 static void send(struct net_buf *buf, bool is_fatal_err)
@@ -260,7 +260,7 @@ static void tx_thread(void)
 	int err;
 
 	while (1) {
-		buf = net_buf_get(&tx_queue, K_FOREVER);
+		buf = k_fifo_get(&tx_queue, K_FOREVER);
 		err = bt_send(buf);
 		if (err) {
 			LOG_ERR("bt_send failed err: %d.", err);
@@ -315,7 +315,7 @@ void bt_ctlr_assert_handle(char *file, uint32_t line)
 #endif /* CONFIG_BT_CTLR_ASSERT_HANDLER */
 
 #if defined(CONFIG_BT_HCI_VS_FATAL_ERROR)
-void k_sys_fatal_error_handler(unsigned int reason, const z_arch_esf_t *esf)
+void k_sys_fatal_error_handler(unsigned int reason, const struct arch_esf *esf)
 {
 	LOG_PANIC();
 
@@ -374,7 +374,7 @@ int ipc_bt_process(void)
 	k_sem_take(&ipc_bound_sem, K_FOREVER);
 
 	while (1) {
-		buf = net_buf_get(&rx_queue, K_FOREVER);
+		buf = k_fifo_get(&rx_queue, K_FOREVER);
 		send(buf, HCI_REGULAR_MSG);
 	}
 

@@ -15,14 +15,14 @@ To learn more about Edge Impulse support in the |NCS| see :ref:`ug_edge_impulse`
 Application overview
 ********************
 
-To perform its tasks, the nRF Machine Learning application uses components available in Zephyr and the |NCS|, namely the :ref:`lib_caf` modules and :ref:`zephyr:sensor_api` for sampling sensors, and :ref:`zephyr:uart_api` or :ref:`nus_service_readme` for forwarding data.
+To perform its tasks, the nRF Machine Learning application uses components available in Zephyr and the |NCS|, namely the :ref:`lib_caf` modules and :ref:`zephyr:sensor` for sampling sensors, and :ref:`zephyr:uart_api` or :ref:`nus_service_readme` for forwarding data.
 It also uses the `Edge Impulse's data forwarder`_ protocol.
 
 Sampling sensors
 ================
 
 The application handles the sensor sampling using the :ref:`caf_sensor_manager`.
-This module uses Zephyr's :ref:`zephyr:sensor_api` to handle the sampling.
+This module uses Zephyr's :ref:`zephyr:sensor` to handle the sampling.
 This approach allows you to use any sensor available in Zephyr.
 
 By default, the following sensors are used by the application:
@@ -659,7 +659,7 @@ Dependencies
 
 The application uses the following Zephyr drivers and libraries:
 
-* :ref:`zephyr:sensor_api`
+* :ref:`zephyr:sensor`
 * :ref:`zephyr:uart_api`
 * :ref:`zephyr:mcu_mgr`
 

@@ -97,6 +97,15 @@ ipc1: &cpuapp_cpuppr_ipc {
        };
 };
 
+/* Remove DTS nodes associated with the cpuflpr target as they refer to the
+ * cpuflpr_code_partition label from the cpuapp_rx_partitions node. The label has
+ * been removed in this file due to the modification of the cpuapp_rx_partitions
+ * node. The cpuflpr_vpr and cpuapp_cpuflpr_ipc DTS nodes are removed to prevent
+ * build failures.
+ */
+/delete-node/ &cpuflpr_vpr;
+/delete-node/ &cpuapp_cpuflpr_ipc;
+
 /* Disable unused sensors and peripherals. */
 /delete-node/ &bme688;
 

@@ -122,7 +122,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_ACL_RX_SIZE=502
 
 CONFIG_BT=y
-CONFIG_BT_HCI_IPC=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_BONDABLE=y

@@ -127,7 +127,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_ACL_RX_SIZE=502
 
 CONFIG_BT=y
-CONFIG_BT_HCI_IPC=y
 CONFIG_BT_SMP=y
 CONFIG_BT_SIGNING=y
 CONFIG_BT_BONDABLE=y

@@ -20,7 +20,7 @@ endchoice
 # 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 (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !WIFI_NRF700X
+	default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !WIFI_NRF70
 
 if BOOTLOADER_MCUBOOT
 
@@ -38,7 +38,7 @@ config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 if SOC_SERIES_NRF53X
 
 config MCUBOOT_UPDATEABLE_IMAGES
-	default 3 if (BOARD_NRF5340DK_NRF5340_CPUAPP && WIFI_NRF700X) #### Support for WiFi patch on external flash memory.
+	default 3 if (BOARD_NRF5340DK_NRF5340_CPUAPP && WIFI_NRF70) #### Support for WiFi patch on external flash memory.
 	default 2
 
 choice MCUBOOT_MODE

@@ -3,7 +3,7 @@
 Adding support for a new Bluetooth LE service
 #############################################
 
-The Matter Bridge application supports bridging Bluetooth LE devices using :ref:`LED Button Service <lbs_readme>` and :ref:`Environmental Sensing Service <peripheral_esp>` Bluetooth services.
+The Matter Bridge application supports bridging Bluetooth LE devices using :ref:`LED Button Service <lbs_readme>` and :zephyr:code-sample:`ble_peripheral_esp` Bluetooth services.
 You can also add support for a proprietary Bluetooth LE service, if required by your use case.
 The functionality of the added Bluetooth LE service has to be represented by one or more device types available in the :ref:`Matter Data Model <ug_matter_device_types>`.
 For example, the :ref:`LED Button Service <lbs_readme>` is represented by the Matter On/Off Light and Matter Generic Switch device types.

@@ -24,7 +24,7 @@ To test the Matter bridge application with the :ref:`Bluetooth LE bridged device
 * An additional development kit compatible with one of the following Bluetooth LE samples:
 
   * :ref:`peripheral_lbs`
-  * :ref:`peripheral_esp`
+  * :zephyr:code-sample:`ble_peripheral_esp`
 
 * A micro-USB cable for every development kit to connect it to the PC.
 
@@ -119,7 +119,7 @@ The application supports two bridged device configurations that are mutually exc
 
   * Nordic Semiconductor's :ref:`LED Button Service <lbs_readme>` - represented by the Matter On/Off Light and Generic Switch device types.
     The service can be configured to use the On/Off Light Switch instead of the Generic Switch device type.
-  * Zephyr's :ref:`Environmental Sensing Service <peripheral_esp>` - represented by the Matter Temperature Sensor and Humidity Sensor device types.
+  * Zephyr's :zephyr:code-sample:`ble_peripheral_esp` - represented by the Matter Temperature Sensor and Humidity Sensor device types.
 
 If the Bluetooth LE service required by your use case is not supported, you can extend the application.
 For information about how to add a new Bluetooth LE service support to the application, see the :ref:`matter_bridge_app_extending_ble_service` section.
@@ -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:
 

@@ -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

@@ -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