From b364fd802a36bd39cde9202d65735da8677bae97 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Mon, 5 Aug 2024 20:49:19 +0530 Subject: [PATCH] treewide: Migrate to nRF70 upstream driver Upstream driver namespace is renamed from nrf700x -> nrf70. Signed-off-by: Chaitanya Tata --- .../asset_tracker_v2/Kconfig.sysbuild | 2 +- .../boards/thingy91x_nrf9151_ns.conf | 4 +- .../overlay-nrf7002ek-wifi-scan-only.conf | 4 +- applications/asset_tracker_v2/sample.yaml | 8 +- .../doc/matter_bridge_description.rst | 21 ++- applications/matter_bridge/sample.yaml | 2 +- .../matter_weather_station/Kconfig.sysbuild | 2 +- .../matter_weather_station/README.rst | 4 +- .../matter_weather_station/sample.yaml | 2 +- boards/nordic/nrf7002dk/Kconfig.sysbuild | 2 +- boards/nordic/thingy91x/CMakeLists.txt | 2 +- .../nrf700x_nrf54h20dk/Kconfig.defconfig | 2 +- .../nrf700x_nrf54l15dk/Kconfig.defconfig | 2 +- .../nrf700x_nrf54l15pdk/Kconfig.defconfig | 2 +- cmake/partition_manager.cmake | 2 +- cmake/sysbuild/nrf700x.cmake | 8 +- .../software_maturity_features.yaml | 20 +-- .../software_maturity_scanner.py | 2 +- .../sysbuild/sysbuild_forced_options.rst | 10 +- doc/nrf/drivers.rst | 1 - doc/nrf/drivers/wifi/nrf700x/nrf700x.rst | 154 ------------------ .../getting_started/memory_optimization.rst | 4 +- .../advanced_modes/promiscuous_operation.rst | 4 +- .../wifi/advanced_modes/raw_tx_operation.rst | 2 +- .../advanced_modes/sniffer_rx_operation.rst | 4 +- doc/nrf/protocols/wifi/regulatory_support.rst | 2 +- doc/nrf/protocols/wifi/sap_mode/sap.rst | 2 +- .../wifi/scan_mode/scan_operation.rst | 2 +- .../protocols/wifi/stack_configuration.rst | 94 +++++------ .../migration/migration_sysbuild.rst | 18 +- .../releases/release-notes-2.4.0.rst | 2 +- .../releases/release-notes-2.6.0.rst | 2 +- lib/location/scan_wifi.c | 2 +- samples/Kconfig | 16 +- .../overlay-nrf700x-wifi-scan-only.conf | 4 +- samples/cellular/location/sample.yaml | 10 +- .../lwm2m_client/overlay-assist-wifi.conf | 2 +- samples/cellular/modem_shell/README.rst | 8 +- .../overlay-nrf700x-wifi-scan-only.conf | 4 +- samples/cellular/modem_shell/sample.yaml | 24 +-- .../overlay-nrf7002ek-wifi-scan-only.conf | 4 +- .../overlay_nrf700x_wifi_coap_no_lte.conf | 4 +- .../overlay_nrf700x_wifi_mqtt_no_lte.conf | 4 +- .../sysbuild_nrf700x-wifi-conn.conf | 4 +- .../sysbuild_nrf700x-wifi-scan.conf | 4 +- .../boards/nrf7002dk_nrf5340_cpuapp.conf | 4 +- .../dfu/ota/ota_image_processor_base_impl.h | 4 +- samples/matter/light_bulb/Kconfig.sysbuild | 2 +- samples/matter/light_switch/Kconfig.sysbuild | 2 +- samples/matter/lock/Kconfig.sysbuild | 2 +- samples/matter/lock/README.rst | 6 +- samples/matter/lock/sample.yaml | 2 +- samples/matter/template/Kconfig.sysbuild | 2 +- samples/matter/template/README.rst | 2 +- samples/matter/template/sample.yaml | 2 +- samples/matter/thermostat/Kconfig.sysbuild | 2 +- .../matter/window_covering/Kconfig.sysbuild | 2 +- .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 6 +- samples/net/azure_iot_hub/README.rst | 1 - .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 8 +- .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 6 +- .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 8 +- .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 6 +- .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 8 +- .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 8 +- .../mqtt/src/modules/network/Kconfig.network | 2 +- .../boards/nrf7002dk_nrf5340_cpuapp_ns.conf | 6 +- samples/wifi/ble_coex/prj.conf | 6 +- samples/wifi/ble_coex/src/main.c | 12 +- samples/wifi/ble_coex/sysbuild.conf | 2 +- samples/wifi/monitor/prj.conf | 4 +- samples/wifi/monitor/sysbuild.conf | 4 +- samples/wifi/promiscuous/prj.conf | 4 +- samples/wifi/promiscuous/sysbuild.conf | 4 +- samples/wifi/provisioning/ble/prj.conf | 2 +- samples/wifi/provisioning/ble/sysbuild.conf | 2 +- samples/wifi/provisioning/softap/prj.conf | 8 +- samples/wifi/radio_test/prj.conf | 4 +- samples/wifi/radio_test/sample.yaml | 4 +- .../src/nrf_wifi_radio_test_shell.c | 8 +- samples/wifi/radio_test/sysbuild.conf | 4 +- samples/wifi/raw_tx_packet/prj.conf | 4 +- samples/wifi/raw_tx_packet/sysbuild.conf | 4 +- samples/wifi/scan/prj.conf | 2 +- samples/wifi/scan/src/main.c | 8 +- samples/wifi/scan/sysbuild.conf | 4 +- samples/wifi/shell/CMakeLists.txt | 4 +- samples/wifi/shell/overlay-monitor-mode.conf | 2 +- .../wifi/shell/overlay-promiscuous-mode.conf | 2 +- samples/wifi/shell/overlay-raw-tx.conf | 2 +- samples/wifi/shell/overlay-sap.conf | 4 +- samples/wifi/shell/overlay-zperf.conf | 4 +- samples/wifi/shell/prj.conf | 6 +- samples/wifi/shell/sample.yaml | 18 +- samples/wifi/shell/sysbuild.conf | 2 +- samples/wifi/shutdown/prj.conf | 2 +- samples/wifi/shutdown/sysbuild.conf | 2 +- samples/wifi/softap/README.rst | 2 +- samples/wifi/softap/prj.conf | 4 +- samples/wifi/softap/sysbuild.conf | 2 +- samples/wifi/sta/Kconfig | 2 +- samples/wifi/sta/README.rst | 4 +- samples/wifi/sta/prj.conf | 4 +- samples/wifi/sta/src/main.c | 4 +- samples/wifi/sta/sysbuild.conf | 2 +- samples/wifi/thread_coex/prj.conf | 6 +- samples/wifi/thread_coex/src/main.c | 10 +- .../wifi/thread_coex/src/ot_coex_functions.c | 4 +- samples/wifi/thread_coex/sysbuild.conf | 2 +- .../throughput/overlay-high-performance.conf | 12 +- .../wifi/throughput/overlay-iot-devices.conf | 14 +- .../throughput/overlay-memory-optimized.conf | 14 +- samples/wifi/throughput/overlay-rx-prio.conf | 14 +- samples/wifi/throughput/overlay-tx-prio.conf | 14 +- samples/wifi/throughput/prj.conf | 6 +- samples/wifi/throughput/sysbuild.conf | 2 +- samples/wifi/twt/prj.conf | 6 +- samples/wifi/twt/sysbuild.conf | 2 +- samples/wifi/wfa_qt_app/prj.conf | 2 +- samples/wifi/wfa_qt_app/sysbuild.conf | 2 +- .../overlay-nrf70-driver-debug.conf | 2 +- subsys/mpsl/cx/Kconfig | 4 +- subsys/net/lib/softap_wifi_provision/Kconfig | 2 +- sysbuild/CMakeLists.txt | 6 +- sysbuild/Kconfig.dfu | 2 +- sysbuild/Kconfig.wifi | 24 +-- sysbuild/Kconfig.zip | 2 +- .../lib/location/location_lib_autoconf_ext.h | 2 +- 128 files changed, 371 insertions(+), 518 deletions(-) delete mode 100644 doc/nrf/drivers/wifi/nrf700x/nrf700x.rst diff --git a/applications/asset_tracker_v2/Kconfig.sysbuild b/applications/asset_tracker_v2/Kconfig.sysbuild index d256f5e26330..39426561f59b 100644 --- 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 index 3096f5ef7848..7e995f9841e2 100644 --- 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 index 35d1507e4df1..ff7daa2e4709 100644 --- 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 index e310535a21fe..879dfbc71298 100644 --- 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 index ff39ab12df72..6065d866cdad 100644 --- 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 index ced33ab9e155..d122ca59c7d6 100644 --- 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 index 326edcf3032d..0676f40964f1 100644 --- 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 index f916bc8d1b8b..eb603dc18a12 100644 --- a/applications/matter_weather_station/README.rst +++ b/applications/matter_weather_station/README.rst @@ -210,7 +210,7 @@ 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 @@ -218,7 +218,7 @@ To build this application to work with the nRF7002 Wi-Fi expansion board: .. 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 index a8d5a35abf72..816ff21cdfdd 100644 --- 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 index 0d57b33a58f4..852dd74a9459 100644 --- 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 index 646e277bd9ec..6d35060c6039 100644 --- 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 index b7120a284924..3de124ae9ce1 100644 --- 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 index b75b1f669609..c63d7c2f214e 100644 --- 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 index 0fe7c7b115ba..9336253fd8f8 100644 --- 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 index 235e4b820698..30f1fe006e46 100644 --- 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 index 77edb6a6801b..cab2389dba80 100644 --- 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 index 2f1ca9ac19ed..e8460b589a8f 100644 --- 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,7 +97,7 @@ 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 @@ -105,11 +105,11 @@ features: - 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 index 6743824077c7..7f08df51d2ba 100644 --- 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 index feab02855037..2768ae589ff0 100644 --- 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,7 +18,7 @@ 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`` | | +-------------------------------------------------------------------------+---------------------------------------------------------------------------+ | @@ -26,13 +26,13 @@ Trying to change them directly in an image will result in the new value being ov +-------------------------------------------------------------------------+---------------------------------------------------------------------------+ | | :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 index 3f646c0eee04..683863e6fcfb 100644 --- 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/* diff --git a/doc/nrf/drivers/wifi/nrf700x/nrf700x.rst b/doc/nrf/drivers/wifi/nrf700x/nrf700x.rst deleted file mode 100644 index 14f1ebcc84e9..000000000000 --- a/doc/nrf/drivers/wifi/nrf700x/nrf700x.rst +++ /dev/null @@ -1,154 +0,0 @@ -.. _nrf700x_wifi: - -nRF Wi-Fi driver -################ - -.. contents:: - :local: - :depth: 2 - -The nRF Wi-Fi driver implements the Wi-Fi® protocol for the nRF70 FullMAC Series of devices. -FullMAC devices implement the Wi-Fi protocol in the chipset. -The driver configures the chipset and transfers the frames to and from the device to the networking stack. - -nRF70 Series device is a companion IC and can be used with any Nordic Semiconductor System-on-Chips (SoCs), such as the nRF53 and nRF91 Series SoCs. - -You can enable the driver by using the :kconfig:option:`CONFIG_WIFI_NRF700X` Kconfig option. - -Architecture -************* - -The following figure illustrates the architecture of the nRF Wi-Fi driver. - -.. figure:: /images/nrf700x_wifi_driver.svg - :alt: nRF Wi-Fi driver block diagram - :align: center - :figclass: align-center - - nRF Wi-Fi driver architecture overview - -Design overview -*************** - -The nRF Wi-Fi driver follows an OS agnostic design, and the driver implementation is split into OS agnostic and OS (Zephyr) specific code. -The OS agnostic code is located in the :file:`sdk-nrfxlib/nrf_wifi/` folder and the Zephyr OS port is located in the :file:`drivers/wifi/nrf700x/` folder. - -The driver supports two modes of operation: - -Wi-Fi mode -========== -In this mode, the driver is designed to be used with the Zephyr networking stack. -It is implemented as a network interface driver. - -The driver supports the following IEEE 802.11 features: - -* Wi-Fi 6 (802.11ax) support -* WPA3™/WPA2™ personal security -* IEEE 802.11 Power Save modes -* Scan-only mode -* IEEE 802.11 :term:`Station mode (STA)` -* :term:`Software-enabled Access Point (SoftAP or SAP)` mode - -The Wi-Fi Direct® mode feature is in the driver code but is not yet supported. - -Except for scan-only mode, the driver uses the host access point daemon (hostapd) to implement AP Media Access Control (MAC) Sublayer Management Entity (AP MLME) and wpa_supplicant to implement 802.1X supplicant. - -Radio Test mode -=============== -The nRF Wi-Fi driver supports Radio Test mode, which you can use to test the RF performance of the nRF70 Series device. -This is a build time option that you can enable using the :kconfig:option:`CONFIG_NRF700X_RADIO_TEST` Kconfig option. - -For more details about using this driver in Radio Test mode, see :ref:`wifi_radio_test`. - -Driver to nRF70 Series device communication -******************************************* - -The driver communicates with the nRF70 Series device using the QSPI/SPI interface. -The driver uses the QSPI/SPI interface to send commands to the nRF70 Series device, and to transfer data to and from the device. -The nRF7002 DK uses QSPI, whereas the nRF7002 EK uses SPI. - -To connect the nRF7002 EK to the SoC, the ``nrf7002ek`` shield is required. - -Configuration -************* - -The nRF Wi-Fi driver has the following configuration options: - -Kconfig configuration -===================== - -.. options-from-kconfig:: - :show-type: - -Devicetree Specification configuration -====================================== - -The maximum transmit power achieved on a nRF70 Series device-based product depends on the frequency band and operating channel. -This varies from chip to chip as well as over different :term:`Printed Circuit Board (PCB)` designs. - -Multiple calibrations and checks are implemented to ensure consistency across channels and devices. -However, these values have a dependency on PCB design, which may result in Error Vector Magnitude (EVM) and spectral mask failures. -To avoid this problem, you can specify the power ceiling at which the EVM and spectral mask are met for a given PCB design. -Additionally, build-time parameters are made available to drivers through the DTS overlay file. - -The following code snippet shows an example of the DTS overlay file: - -.. code-block:: devicetree - - / - { - nrf70_tx_power_ceiling: nrf70_tx_power_ceiling_node { - status = "okay"; - compatible = "nordic,nrf700x-tx-power-ceiling"; - max-pwr-2g-dsss = <0x54>; - max-pwr-2g-mcs0 = <0x40>; - max-pwr-2g-mcs7 = <0x40>; - max-pwr-5g-low-mcs0 = <0x38>; - max-pwr-5g-low-mcs7 = <0x38>; - max-pwr-5g-mid-mcs0 = <0x38>; - max-pwr-5g-mid-mcs7 = <0x38>; - max-pwr-5g-high-mcs0 = <0x38>; - max-pwr-5g-high-mcs7 = <0x38>; - }; - - }; - - -The following table lists the parameters (8-bit unsigned values) defined in the DTS overlay board files: - -.. list-table:: DTS file parameters - :header-rows: 1 - - * - DTS parameter - - Description - * - max-pwr-2g-dsss - - Transmit power ceiling for DSSS data rate in 0.25 dBm steps. - This is applicable for all DSSS data rates. - * - max-pwr-2g-mcs0 - - Transmit power ceiling for MCS0 data rate in 2.4 GHz band in steps of 0.25 dBm steps. - * - max-pwr-2g-mcs7 - - Transmit power ceiling for MCS7 data rate in 2.4 GHz band in steps of 0.25 dBm steps. - * - max-pwr-5g-low-mcs0 - - Transmit power ceiling for MCS0 in lower 5 GHz frequency band in steps of 0.25 dBm. - Lower 5 GHz frequency band refers to channels from 36 to 64. - * - max-pwr-5g-low-mcs7 - - Transmit power ceiling for MCS7 in lower 5 GHz frequency band in steps of 0.25 dBm. - * - max-pwr-5g-mid-mcs0 - - Transmit power ceiling for MCS0 in mid 5 GHz frequency band in steps of 0.25 dBm. - Mid 5 GHz frequency band refers to channels from 100 to 132. - * - max-pwr-5g-mid-mcs7 - - Transmit power ceiling for MCS7 in mid 5 GHz frequency band in steps of 0.25 dBm. - * - max-pwr-5g-high-mcs0 - - Transmit power ceiling for MCS0 in high 5 GHz frequency band in steps of 0.25 dBm. - High 5 GHz frequency band refers to channels from 136 to 177. - * - max-pwr-5g-mid-mcs7 - - Transmit power ceiling for MCS7 in mid 5 GHz frequency band in steps of 0.25 dBm. - - -API documentation -***************** - -After the nRF Wi-Fi driver has been initialized, the application will see it as an Ethernet interface. -To use the Ethernet interface, the application can use `Zephyr Network APIs`_. - -See the :ref:`nrfxlib:nrf_wifi_driver` to learn more about various modes of low-level API. diff --git a/doc/nrf/protocols/matter/getting_started/memory_optimization.rst b/doc/nrf/protocols/matter/getting_started/memory_optimization.rst index 229ebc4404bf..1b2b7bef66c4 100644 --- a/doc/nrf/protocols/matter/getting_started/memory_optimization.rst +++ b/doc/nrf/protocols/matter/getting_started/memory_optimization.rst @@ -401,9 +401,9 @@ The following table presents the possible threads used in a Matter application a | | | Processing Wi-Fi task queue | | | | For Matter over Wi-Fi only. | +---------------------+------------------------------------------------------------------+----------------------------------------------------------------+ -| nrf700x_bh_wq | :kconfig:option:`CONFIG_NRF700X_BH_WQ_STACK_SIZE` | nRF700x Wi-Fi driver work queue. | +| nrf700x_bh_wq | :kconfig:option:`CONFIG_NRF70_BH_WQ_STACK_SIZE` | nRF700x Wi-Fi driver work queue. | +---------------------+------------------------------------------------------------------+----------------------------------------------------------------+ -| nrf700x_intr_wq | :kconfig:option:`CONFIG_NRF700X_IRQ_WQ_STACK_SIZE` | Interrupts processing generated by the nRF700X Wi-Fi radio. | +| nrf700x_intr_wq | :kconfig:option:`CONFIG_NRF70_IRQ_WQ_STACK_SIZE` | Interrupts processing generated by the nRF700X Wi-Fi radio. | +---------------------+------------------------------------------------------------------+----------------------------------------------------------------+ | mbox_wq | :kconfig:option:`CONFIG_IPC_SERVICE_BACKEND_RPMSG_WQ_STACK_SIZE` | Inter Processor Communication. | | | | For multi-processors targets only. | diff --git a/doc/nrf/protocols/wifi/advanced_modes/promiscuous_operation.rst b/doc/nrf/protocols/wifi/advanced_modes/promiscuous_operation.rst index 846ac1d3a26b..0e0ef1067c39 100644 --- a/doc/nrf/protocols/wifi/advanced_modes/promiscuous_operation.rst +++ b/doc/nrf/protocols/wifi/advanced_modes/promiscuous_operation.rst @@ -16,7 +16,7 @@ In Promiscuous mode of operation, all received IEEE 802.11 packets that belong t Enabling Promiscuous mode ************************* -To use the Promiscuous mode feature in your applications, you must enable the :kconfig:option:`CONFIG_NRF700X_PROMISC_DATA_RX` Kconfig option in the project configuration. +To use the Promiscuous mode feature in your applications, you must enable the :kconfig:option:`CONFIG_NRF70_PROMISC_DATA_RX` Kconfig option in the project configuration. .. _ug_nrf70_developing_promiscuous_mode_operation: @@ -138,7 +138,7 @@ TX injection mode can be enabled concurrently with Promiscuous mode on the nRF70 TX injection mode allows the transmission of a raw 802.11 transmit packet. Raw IEEE 802.11 packets are packets that are not modified by the 802.11 Medium Access Control (MAC) layer during transmission by the nRF70 Series device. -To use the TX injection mode in your application, you need to enable the :kconfig:option:`CONFIG_NRF700X_RAW_DATA_TX` Kconfig option in the project configuration. +To use the TX injection mode in your application, you need to enable the :kconfig:option:`CONFIG_NRF70_RAW_DATA_TX` Kconfig option in the project configuration. TX injection mode can be enabled during runtime by invoking the API ``net_eth_txinjection_mode``. The API has the following parameters as described below. diff --git a/doc/nrf/protocols/wifi/advanced_modes/raw_tx_operation.rst b/doc/nrf/protocols/wifi/advanced_modes/raw_tx_operation.rst index 824087ac2f4e..a94e9aa43641 100644 --- a/doc/nrf/protocols/wifi/advanced_modes/raw_tx_operation.rst +++ b/doc/nrf/protocols/wifi/advanced_modes/raw_tx_operation.rst @@ -18,7 +18,7 @@ The MAC layer on the nRF70 Series device will transmit the raw 802.11 packets ov Enabling raw packet transmit feature ************************************ -To use the raw packet transmit feature in your applications, you must enable the :kconfig:option:`CONFIG_NRF700X_RAW_DATA_TX` Kconfig option in the project configuration. +To use the raw packet transmit feature in your applications, you must enable the :kconfig:option:`CONFIG_NRF70_RAW_DATA_TX` Kconfig option in the project configuration. .. _ug_nrf70_developing_tx_injection_mode: diff --git a/doc/nrf/protocols/wifi/advanced_modes/sniffer_rx_operation.rst b/doc/nrf/protocols/wifi/advanced_modes/sniffer_rx_operation.rst index 4b1c3fa4a37e..4bcc3ee298ba 100644 --- a/doc/nrf/protocols/wifi/advanced_modes/sniffer_rx_operation.rst +++ b/doc/nrf/protocols/wifi/advanced_modes/sniffer_rx_operation.rst @@ -19,7 +19,7 @@ The raw RX header contains parameters of the received packet, including data rat Enabling Monitor mode ********************* -To use the Monitor mode in your application, you need to enable the :kconfig:option:`CONFIG_NRF700X_RAW_DATA_RX` Kconfig option in the project configuration. +To use the Monitor mode in your application, you need to enable the :kconfig:option:`CONFIG_NRF70_RAW_DATA_RX` Kconfig option in the project configuration. .. _ug_nrf70_developing_monitor_mode_operation: @@ -153,7 +153,7 @@ TX injection mode can be enabled for operation when the nRF70 Series device is c TX injection mode allows the transmission of a raw 802.11 transmit packet. Raw IEEE 802.11 packets are packets that are not modified by the 802.11 Medium Access Control (MAC) layer during transmission by the nRF70 Series device. -To use the TX injection mode in your application, you need to enable the :kconfig:option:`CONFIG_NRF700X_RAW_DATA_TX` Kconfig option in the project configuration. +To use the TX injection mode in your application, you need to enable the :kconfig:option:`CONFIG_NRF70_RAW_DATA_TX` Kconfig option in the project configuration. TX injection mode can be enabled during runtime by invoking the API ``net_eth_txinjection_mode``. The API has the following parameters as described below. diff --git a/doc/nrf/protocols/wifi/regulatory_support.rst b/doc/nrf/protocols/wifi/regulatory_support.rst index 53b4b28e84e6..49699da2f70e 100644 --- a/doc/nrf/protocols/wifi/regulatory_support.rst +++ b/doc/nrf/protocols/wifi/regulatory_support.rst @@ -272,7 +272,7 @@ You can configure the regulatory domain through build time or run time. Build time ========== -Use the :kconfig:option:`CONFIG_NRF700X_REG_DOMAIN` Kconfig option to set the regulatory region. +Use the :kconfig:option:`CONFIG_NRF70_REG_DOMAIN` Kconfig option to set the regulatory region. The regulatory region will take an ISO/IEC alpha-2 country code for the country in which the device is expected to operate. The beacon's regulatory region (if present) will be given higher precedence over the Kconfig option. diff --git a/doc/nrf/protocols/wifi/sap_mode/sap.rst b/doc/nrf/protocols/wifi/sap_mode/sap.rst index 2c5942fcfeac..ea90037c3d16 100644 --- a/doc/nrf/protocols/wifi/sap_mode/sap.rst +++ b/doc/nrf/protocols/wifi/sap_mode/sap.rst @@ -30,7 +30,7 @@ The SAP mode in the nRF70 Series devices provides SoftAP support with the follow Enabling the SAP mode ********************* -You can enable the SAP mode by setting the :kconfig:option:`CONFIG_NRF700X_AP_MODE` and :kconfig:option:`CONFIG_WPA_SUPP_AP` Kconfig options in the application project configuration file. +You can enable the SAP mode by setting the :kconfig:option:`CONFIG_NRF70_AP_MODE` and :kconfig:option:`CONFIG_WPA_SUPP_AP` Kconfig options in the application project configuration file. SAP mode configuration diff --git a/doc/nrf/protocols/wifi/scan_mode/scan_operation.rst b/doc/nrf/protocols/wifi/scan_mode/scan_operation.rst index 38e835c1b7de..202acec1da4b 100644 --- a/doc/nrf/protocols/wifi/scan_mode/scan_operation.rst +++ b/doc/nrf/protocols/wifi/scan_mode/scan_operation.rst @@ -145,7 +145,7 @@ The following controls can fine-tune the time taken and power consumed by a scan | :c:member:`wifi_scan_params.chan` * - Skip locally administered MAC addresses - | Build time: - | :kconfig:option:`CONFIG_WIFI_NRF700X_SKIP_LOCAL_ADMIN_MAC` + | :kconfig:option:`CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC` Scan robustness *************** diff --git a/doc/nrf/protocols/wifi/stack_configuration.rst b/doc/nrf/protocols/wifi/stack_configuration.rst index f72fbcec9b21..511eac9daecd 100644 --- a/doc/nrf/protocols/wifi/stack_configuration.rst +++ b/doc/nrf/protocols/wifi/stack_configuration.rst @@ -69,19 +69,19 @@ The nRF Wi-Fi driver provides the following software configurations to fine-tune - Memory savings - This specifies the inclusion of the WPA supplicant module. Disabling this flag restricts the nRF Wi-Fi driver's functionality to STA scan only. - * - :kconfig:option:`CONFIG_NRF700X_AP_MODE` + * - :kconfig:option:`CONFIG_NRF70_AP_MODE` - ``y`` or ``n`` - Enable or disable Access Point (AP) mode - Memory savings - This specifies the inclusion of the AP mode module. Disabling this flag restricts the nRF Wi-Fi driver's functionality to :term:`Station mode (STA)` only. - * - :kconfig:option:`CONFIG_NRF700X_P2P_MODE` + * - :kconfig:option:`CONFIG_NRF70_P2P_MODE` - ``y`` or ``n`` - Enable or disable Wi-Fi direct mode - Memory Savings - This specifies the inclusion of the P2P mode module. Disabling this flag restricts the nRF Wi-Fi driver's functionality to STA or AP mode only. - * - :kconfig:option:`CONFIG_NRF700X_MAX_TX_TOKENS` + * - :kconfig:option:`CONFIG_NRF70_MAX_TX_TOKENS` - ``5``, ``10``, ``11``, ``12`` - Maximum number of TX tokens. These are distributed across all WMM® access categories (including a pool for all). @@ -90,27 +90,27 @@ The nRF Wi-Fi driver provides the following software configurations to fine-tune More tokens imply more concurrent transmit opportunities for RPU but can lead to poor aggregation performance if the pipeline is not saturated. But to saturate the pipeline, a greater number of networking stack buffers, or queue depth, is required. - * - :kconfig:option:`CONFIG_NRF700X_MAX_TX_AGGREGATION` + * - :kconfig:option:`CONFIG_NRF70_MAX_TX_AGGREGATION` - ``1`` to ``Unlimited`` (based on available memory in nRF70 Series device) - Maximum number of frames that are coalesced into a single Wi-Fi frame (for example, MPDU's in an A-MPDU, or MSDU's in an A-MSDU). The coalescing greatly improves the throughput for small frames or under high traffic load. - Performance tuning and Memory savings - This specifies the maximum number of frames that can be coalesced into a single Wi-Fi frame. More frames imply more coalescing opportunities but can add latency to the TX path as we wait for more frames to arrive. - * - :kconfig:option:`CONFIG_NRF700X_RX_NUM_BUFS` + * - :kconfig:option:`CONFIG_NRF70_RX_NUM_BUFS` - ``1`` to ``Unlimited`` (based on available memory in nRF70 Series device) - Number of RX buffers - Memory savings - This specifies the number of RX buffers that can be used by the nRF Wi-Fi driver. The number of buffers must be enough to keep up with the RX traffic, otherwise packets might be dropped. - * - :kconfig:option:`CONFIG_NRF700X_TX_MAX_DATA_SIZE` + * - :kconfig:option:`CONFIG_NRF70_TX_MAX_DATA_SIZE` - ``64`` to ``1600`` - Maximum TX data size - Memory savings - This specifies the maximum size of Wi-Fi protocol frames that can be transmitted. Large frame sizes imply more memory usage but can efficiently utilize the bandwidth. If the application does not need to send large frames, then this can be reduced to save memory. - * - :kconfig:option:`CONFIG_NRF700X_RX_MAX_DATA_SIZE` + * - :kconfig:option:`CONFIG_NRF70_RX_MAX_DATA_SIZE` - ``64`` to ``1600`` - Maximum RX data size - Memory savings @@ -129,30 +129,30 @@ nRF70 Series packet memory The nRF70 Series device chipset has a special memory called the packet memory to store the Wi-Fi protocol frames for both TX and RX. The various configuration options that control the size of the packet memory are listed below: -* :kconfig:option:`CONFIG_NRF700X_TX_MAX_DATA_SIZE` -* :kconfig:option:`CONFIG_NRF700X_RX_MAX_DATA_SIZE` -* :kconfig:option:`CONFIG_NRF700X_MAX_TX_TOKENS` -* :kconfig:option:`CONFIG_NRF700X_MAX_TX_AGGREGATION` -* :kconfig:option:`CONFIG_NRF700X_RX_NUM_BUFS` +* :kconfig:option:`CONFIG_NRF70_TX_MAX_DATA_SIZE` +* :kconfig:option:`CONFIG_NRF70_RX_MAX_DATA_SIZE` +* :kconfig:option:`CONFIG_NRF70_MAX_TX_TOKENS` +* :kconfig:option:`CONFIG_NRF70_MAX_TX_AGGREGATION` +* :kconfig:option:`CONFIG_NRF70_RX_NUM_BUFS` The packet memory is divided into two parts, one for TX and one for RX. The size of the TX packet memory is calculated as follows: .. code-block:: none - (CONFIG_NRF700X_TX_MAX_DATA_SIZE + 52 ) * CONFIG_NRF700X_MAX_TX_TOKENS * CONFIG_NRF700X_MAX_TX_AGGREGATION + (CONFIG_NRF70_TX_MAX_DATA_SIZE + 52 ) * CONFIG_NRF70_MAX_TX_TOKENS * CONFIG_NRF70_MAX_TX_AGGREGATION The size of the RX packet memory is calculated as follows: .. code-block:: none - CONFIG_NRF700X_RX_MAX_DATA_SIZE * CONFIG_NRF700X_RX_NUM_BUFS + CONFIG_NRF70_RX_MAX_DATA_SIZE * CONFIG_NRF70_RX_NUM_BUFS The total packet memory size is calculated as follows: .. code-block:: none - (CONFIG_NRF700X_TX_MAX_DATA_SIZE + 52 ) * CONFIG_NRF700X_MAX_TX_TOKENS * CONFIG_NRF700X_MAX_TX_AGGREGATION + - CONFIG_NRF700X_RX_MAX_DATA_SIZE * CONFIG_NRF700X_RX_NUM_BUFS + (CONFIG_NRF70_TX_MAX_DATA_SIZE + 52 ) * CONFIG_NRF70_MAX_TX_TOKENS * CONFIG_NRF70_MAX_TX_AGGREGATION + + CONFIG_NRF70_RX_MAX_DATA_SIZE * CONFIG_NRF70_RX_NUM_BUFS There is a build time check to ensure that the total packet memory size does not exceed the available packet memory size in the nRF70 Series chip. @@ -177,8 +177,8 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li * - STA scan only - Scan only - ``CONFIG_WPA_SUPP=n`` - ``CONFIG_NRF700X_AP_MODE=n`` - ``CONFIG_NRF700X_P2P_MODE=n`` + ``CONFIG_NRF70_AP_MODE=n`` + ``CONFIG_NRF70_P2P_MODE=n`` ``CONFIG_NET_PKT_TX_COUNT=1`` ``CONFIG_NET_PKT_RX_COUNT=1`` ``CONFIG_NET_BUF_TX_COUNT=1`` @@ -188,19 +188,19 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li * - :abbr:`STA (Station)` mode - IoT devices - ``CONFIG_WPA_SUPP=y`` - ``CONFIG_NRF700X_AP_MODE=n`` - ``CONFIG_NRF700X_P2P_MODE=n`` + ``CONFIG_NRF70_AP_MODE=n`` + ``CONFIG_NRF70_P2P_MODE=n`` ``CONFIG_NET_PKT_TX_COUNT=6`` ``CONFIG_NET_PKT_RX_COUNT=6`` ``CONFIG_NET_BUF_TX_COUNT=12`` ``CONFIG_NET_BUF_RX_COUNT=6`` - ``CONFIG_NRF700X_RX_NUM_BUFS=6`` + ``CONFIG_NRF70_RX_NUM_BUFS=6`` ``CONFIG_NET_BUF_DATA_SIZE=800`` ``CONFIG_HEAP_MEM_POOL_SIZE=230000`` ``CONFIG_SPEED_OPTIMIZATIONS=y`` - ``CONFIG_NRF700X_UTIL=n`` - ``CONFIG_NRF700X_MAX_TX_AGGREGATION=1`` - ``CONFIG_NRF700X_MAX_TX_TOKENS=5`` + ``CONFIG_NRF70_UTIL=n`` + ``CONFIG_NRF70_MAX_TX_AGGREGATION=1`` + ``CONFIG_NRF70_MAX_TX_TOKENS=5`` - IoT devices - ``TCP-TX: 5.2 Mbps`` ``TCP-RX: 3.4 Mbps`` @@ -209,19 +209,19 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li * - :abbr:`STA (Station)` mode - Memory optimized :abbr:`STA (Station)` mode - ``CONFIG_WPA_SUPP=y`` - ``CONFIG_NRF700X_AP_MODE=n`` - ``CONFIG_NRF700X_P2P_MODE=n`` + ``CONFIG_NRF70_AP_MODE=n`` + ``CONFIG_NRF70_P2P_MODE=n`` ``CONFIG_NET_PKT_TX_COUNT=6`` ``CONFIG_NET_PKT_RX_COUNT=6`` ``CONFIG_NET_BUF_TX_COUNT=12`` ``CONFIG_NET_BUF_RX_COUNT=6`` - ``CONFIG_NRF700X_RX_NUM_BUFS=6`` + ``CONFIG_NRF70_RX_NUM_BUFS=6`` ``CONFIG_NET_BUF_DATA_SIZE=500`` ``CONFIG_HEAP_MEM_POOL_SIZE=230000`` ``CONFIG_SPEED_OPTIMIZATIONS=y`` - ``CONFIG_NRF700X_UTIL=n`` - ``CONFIG_NRF700X_MAX_TX_AGGREGATION=1`` - ``CONFIG_NRF700X_MAX_TX_TOKENS=5`` + ``CONFIG_NRF70_UTIL=n`` + ``CONFIG_NRF70_MAX_TX_AGGREGATION=1`` + ``CONFIG_NRF70_MAX_TX_TOKENS=5`` - Sensors with low data requirements - ``TCP-TX: 0.3 Mbps`` ``TCP-RX: 1.5 Mbps`` @@ -230,8 +230,8 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li * - :abbr:`STA (Station)` mode - High performance :abbr:`STA (Station)` mode - ``CONFIG_WPA_SUPP=y`` - ``CONFIG_NRF700X_AP_MODE=n`` - ``CONFIG_NRF700X_P2P_MODE=n`` + ``CONFIG_NRF70_AP_MODE=n`` + ``CONFIG_NRF70_P2P_MODE=n`` ``CONFIG_NET_PKT_TX_COUNT=30`` ``CONFIG_NET_PKT_RX_COUNT=30`` ``CONFIG_NET_BUF_TX_COUNT=60`` @@ -239,9 +239,9 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li ``CONFIG_NET_BUF_DATA_SIZE=1100`` ``CONFIG_HEAP_MEM_POOL_SIZE=230000`` ``CONFIG_SPEED_OPTIMIZATIONS=y`` - ``CONFIG_NRF700X_UTIL=n`` - ``CONFIG_NRF700X_MAX_TX_AGGREGATION=9`` - ``CONFIG_NRF700X_MAX_TX_TOKENS=12`` + ``CONFIG_NRF70_UTIL=n`` + ``CONFIG_NRF70_MAX_TX_AGGREGATION=9`` + ``CONFIG_NRF70_MAX_TX_TOKENS=12`` - High data rate IoT devices - ``TCP-TX: 14.2 Mbps`` ``TCP-RX: 7.4 Mbps`` @@ -250,19 +250,19 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li * - :abbr:`STA (Station)` mode - TX prioritized :abbr:`STA (Station)` mode - ``CONFIG_WPA_SUPP=y`` - ``CONFIG_NRF700X_AP_MODE=n`` - ``CONFIG_NRF700X_P2P_MODE=n`` + ``CONFIG_NRF70_AP_MODE=n`` + ``CONFIG_NRF70_P2P_MODE=n`` ``CONFIG_NET_PKT_TX_COUNT=32`` ``CONFIG_NET_PKT_RX_COUNT=10`` ``CONFIG_NET_BUF_TX_COUNT=64`` ``CONFIG_NET_BUF_RX_COUNT=10`` - ``CONFIG_NRF700X_RX_NUM_BUFS=10`` + ``CONFIG_NRF70_RX_NUM_BUFS=10`` ``CONFIG_NET_BUF_DATA_SIZE=1100`` ``CONFIG_HEAP_MEM_POOL_SIZE=230000`` ``CONFIG_SPEED_OPTIMIZATIONS=y`` - ``CONFIG_NRF700X_UTIL=n`` - ``CONFIG_NRF700X_MAX_TX_AGGREGATION=9`` - ``CONFIG_NRF700X_MAX_TX_TOKENS=12`` + ``CONFIG_NRF70_UTIL=n`` + ``CONFIG_NRF70_MAX_TX_AGGREGATION=9`` + ``CONFIG_NRF70_MAX_TX_TOKENS=12`` - Sensors with high data rate - ``TCP-TX: 9.2 Mbps`` ``TCP-RX: 3.6 Mbps`` @@ -271,19 +271,19 @@ The nRF Wi-Fi driver can be used in the following profiles (not an exhaustive li * - :abbr:`STA (Station)` mode - RX prioritized :abbr:`STA (Station)` mode - ``CONFIG_WPA_SUPP=y`` - ``CONFIG_NRF700X_AP_MODE=n`` - ``CONFIG_NRF700X_P2P_MODE=n`` + ``CONFIG_NRF70_AP_MODE=n`` + ``CONFIG_NRF70_P2P_MODE=n`` ``CONFIG_NET_PKT_TX_COUNT=5`` ``CONFIG_NET_PKT_RX_COUNT=64`` ``CONFIG_NET_BUF_TX_COUNT=10`` ``CONFIG_NET_BUF_RX_COUNT=64`` - ``CONFIG_NRF700X_RX_NUM_BUFS=64`` + ``CONFIG_NRF70_RX_NUM_BUFS=64`` ``CONFIG_NET_BUF_DATA_SIZE=1100`` ``CONFIG_HEAP_MEM_POOL_SIZE=230000`` ``CONFIG_SPEED_OPTIMIZATIONS=y`` - ``CONFIG_NRF700X_UTIL=n`` - ``CONFIG_NRF700X_MAX_TX_AGGREGATION=2`` - ``CONFIG_NRF700X_MAX_TX_TOKENS=5`` + ``CONFIG_NRF70_UTIL=n`` + ``CONFIG_NRF70_MAX_TX_AGGREGATION=2`` + ``CONFIG_NRF70_MAX_TX_TOKENS=5`` - Display devices streaming data - ``TCP-TX: 5.3 Mbps`` ``TCP-RX: 7.9 Mbps`` diff --git a/doc/nrf/releases_and_maturity/migration/migration_sysbuild.rst b/doc/nrf/releases_and_maturity/migration/migration_sysbuild.rst index 9784975f1bf3..459937ea0629 100644 --- a/doc/nrf/releases_and_maturity/migration/migration_sysbuild.rst +++ b/doc/nrf/releases_and_maturity/migration/migration_sysbuild.rst @@ -255,24 +255,24 @@ Applications must enable these options if they generate factory data or need an .. _child_parent_to_sysbuild_migration_nrf700x: -nRF700x -======= +nRF70 Series +============ -Support for nRF700x operating mode and firmware storage has moved to sysbuild. +Support for the nRF70 Series operating mode and firmware storage has moved to sysbuild. The following Kconfig options are available: +----------------------------------------------------------------+-----------------------------------------------------------------------------+ | Kconfig option | Description | +================================================================+=============================================================================+ -| ``SB_CONFIG_WIFI_NRF700X`` | Enable Wifi support for nRF700x | +| ``SB_CONFIG_WIFI_NRF70`` | Enable Wifi support for the nRF70 Series devices | +----------------------------------------------------------------+-----------------------------------------------------------------------------+ -| ``SB_CONFIG_WIFI_NRF700X_SYSTEM_MODE`` | Use system mode firmware patches and set application to this mode | +| ``SB_CONFIG_WIFI_NRF70_SYSTEM_MODE`` | Use system mode firmware patches and set application to this mode | +----------------------------------------------------------------+-----------------------------------------------------------------------------+ -| ``SB_CONFIG_WIFI_NRF700X_SCAN_ONLY`` | Use scan-only mode firmware patches and set application to this mode | +| ``SB_CONFIG_WIFI_NRF70_SCAN_ONLY`` | Use Scan-only mode firmware patches and set application to this mode | +----------------------------------------------------------------+-----------------------------------------------------------------------------+ -| ``SB_CONFIG_WIFI_NRF700X_RADIO_TEST`` | Use radio test mode firmware patches and set application to this mode | +| ``SB_CONFIG_WIFI_NRF70_RADIO_TEST`` | Use Radio Test mode firmware patches and set application to this mode | +----------------------------------------------------------------+-----------------------------------------------------------------------------+ -| ``SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES`` | Use system with raw modes firmware patches and set application to this mode | +| ``SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES`` | Use system with Raw modes firmware patches and set application to this mode | +----------------------------------------------------------------+-----------------------------------------------------------------------------+ | ``SB_CONFIG_WIFI_PATCHES_EXT_FLASH_DISABLED`` | Load firmware patches directly from ram (default) | +----------------------------------------------------------------+-----------------------------------------------------------------------------+ @@ -304,7 +304,7 @@ The following Kconfig options are available: +-------------------------------------------------------------------+---------------------------------------------------+ | ``SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_MCUBOOT`` | Include MCUboot update in package | +-------------------------------------------------------------------+---------------------------------------------------+ -| ``SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH`` | Include nRF7000x firmware patch update in package | +| ``SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH`` | Include nRF70 firmware patch update in package | +-------------------------------------------------------------------+---------------------------------------------------+ You must update your application to select the required Kconfig options at the sysbuild level to have this file generated. diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.4.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.4.0.rst index 630697cd785a..6f5724bd6647 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.4.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.4.0.rst @@ -653,7 +653,7 @@ Drivers This section provides detailed lists of changes by :ref:`driver `. -* Added :ref:`nrf700x_wifi`. +* Added nRF Wi-Fi driver. Libraries ========= diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst b/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst index 3076320558c2..572172aa6a91 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-2.6.0.rst @@ -998,7 +998,7 @@ Wi-Fi drivers * OS agnostic code is moved to |NCS| (``sdk-nrfxlib``) repository. - * Low-level API documentation is now available on the :ref:`Wi-Fi driver API `. + * Low-level API documentation is now available on the ``Wi-Fi driver API``. * The Wi-Fi interface is now renamed and registered as a devicetree instance. diff --git a/lib/location/scan_wifi.c b/lib/location/scan_wifi.c index 5b6285f4d2f7..f667664b5c4a 100644 --- a/lib/location/scan_wifi.c +++ b/lib/location/scan_wifi.c @@ -214,7 +214,7 @@ int scan_wifi_init(void) const struct device *wifi_dev; wifi_iface = NULL; -#if defined(CONFIG_WIFI_NRF700X) +#if defined(CONFIG_WIFI_NRF70) wifi_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_wifi)); #else wifi_dev = DEVICE_DT_GET(DT_CHOSEN(ncs_location_wifi)); diff --git a/samples/Kconfig b/samples/Kconfig index 8ebec34b1070..4b9b6eb6c6b5 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -19,7 +19,7 @@ config NCS_SAMPLES_DEFAULTS if SOC_SERIES_NRF53X -config NRF700X_RADIO_TEST_COMBO +config NRF70_RADIO_TEST_COMBO bool "Enable radio test combo build for nRF5340" depends on SOC_NRF5340_CPUAPP select BOARD_ENABLE_CPUNET @@ -34,9 +34,9 @@ config NCS_SAMPLE_EMPTY_APP_CORE_CHILD_IMAGE config NCS_INCLUDE_RPMSG_CHILD_IMAGE bool "Include RPMsg sample on netcore" - depends on SOC_NRF5340_CPUAPP && (BT_HCI_IPC || NRF_802154_SER_HOST || BT_RPC || NRF700X_RADIO_TEST_COMBO) + depends on SOC_NRF5340_CPUAPP && (BT_HCI_IPC || NRF_802154_SER_HOST || BT_RPC || NRF70_RADIO_TEST_COMBO) select PARTITION_MANAGER_ENABLED - default y if BT_HCI_IPC || NRF_802154_SER_HOST || BT_RPC || NRF700X_RADIO_TEST_COMBO + default y if BT_HCI_IPC || NRF_802154_SER_HOST || BT_RPC || NRF70_RADIO_TEST_COMBO help Enabling this setting will include a network stack to run on the network core and communicate over RPMsg with the application core. @@ -74,35 +74,35 @@ if NCS_INCLUDE_RPMSG_CHILD_IMAGE config NCS_SAMPLE_MULTIPROTOCOL_RPMSG_CHILD_IMAGE bool - depends on BT_HCI_IPC && NRF_802154_SER_HOST && !BT_RPC && !NRF700X_RADIO_TEST_COMBO + depends on BT_HCI_IPC && NRF_802154_SER_HOST && !BT_RPC && !NRF70_RADIO_TEST_COMBO default y help multiprotocol_rpmsg sample as a child image (network core). config NCS_SAMPLE_HCI_IPC_CHILD_IMAGE bool - depends on BT_HCI_IPC && !NRF_802154_SER_HOST && !BT_RPC && !NRF700X_RADIO_TEST_COMBO + depends on BT_HCI_IPC && !NRF_802154_SER_HOST && !BT_RPC && !NRF70_RADIO_TEST_COMBO default y help hci_ipc sample as a child image (network core). config NCS_SAMPLE_802154_RPMSG_CHILD_IMAGE bool - depends on NRF_802154_SER_HOST && !BT_HCI_IPC && !BT_RPC && !NRF700X_RADIO_TEST_COMBO + depends on NRF_802154_SER_HOST && !BT_HCI_IPC && !BT_RPC && !NRF70_RADIO_TEST_COMBO default y help 802154_rpmsg sample as a child image (network core). config NCS_SAMPLE_RPC_HOST_CHILD_IMAGE bool - depends on BT_RPC && !NRF700X_RADIO_TEST_COMBO + depends on BT_RPC && !NRF70_RADIO_TEST_COMBO default y help rpc_host sample as a child image (network core). config NCS_SAMPLE_PERIPHERAL_RADIO_TEST_CHILD_IMAGE bool "Add peripheral radio_test sample as a child image" - depends on NRF700X_RADIO_TEST_COMBO + depends on NRF70_RADIO_TEST_COMBO default y select PARTITION_MANAGER_ENABLED help diff --git a/samples/cellular/location/overlay-nrf700x-wifi-scan-only.conf b/samples/cellular/location/overlay-nrf700x-wifi-scan-only.conf index 04a94d6d4263..b00d65a3f0a9 100644 --- a/samples/cellular/location/overlay-nrf700x-wifi-scan-only.conf +++ b/samples/cellular/location/overlay-nrf700x-wifi-scan-only.conf @@ -21,8 +21,8 @@ CONFIG_LOCATION_WORKQUEUE_STACK_SIZE=8192 # 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. # Also see comments for CONFIG_HEAP_MEM_POOL_SIZE. CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT=60 diff --git a/samples/cellular/location/sample.yaml b/samples/cellular/location/sample.yaml index b19f663aeaae..9f5160789fcf 100644 --- a/samples/cellular/location/sample.yaml +++ b/samples/cellular/location/sample.yaml @@ -42,7 +42,7 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek OVERLAY_CONFIG=overlay-nrf700x-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_samples_cellular sample.cellular.location.nrf7000ek_wifi: sysbuild: true @@ -56,8 +56,8 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7000 OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf - CONFIG_WPA_SUPP=n SB_CONFIG_WIFI_NRF700X=y - SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y + CONFIG_WPA_SUPP=n SB_CONFIG_WIFI_NRF70=y + SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y tags: ci_build sysbuild ci_samples_cellular sample.cellular.location.nrf7001ek_wifi: sysbuild: true @@ -71,7 +71,7 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7001 OVERLAY_CONFIG=overlay-nrf700x-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_samples_cellular sample.cellular.location.thingy91x_wifi: sysbuild: true @@ -82,7 +82,7 @@ tests: - thingy91x/nrf9151/ns extra_args: OVERLAY_CONFIG=overlay-nrf700x-wifi-scan-only.conf DTC_OVERLAY_FILE=thingy91x_wifi.overlay - 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_samples_cellular # Configuration which will be used by the CI positioning integration job to verify PRs diff --git a/samples/cellular/lwm2m_client/overlay-assist-wifi.conf b/samples/cellular/lwm2m_client/overlay-assist-wifi.conf index 789e9bd3af25..e3af40f6620f 100644 --- a/samples/cellular/lwm2m_client/overlay-assist-wifi.conf +++ b/samples/cellular/lwm2m_client/overlay-assist-wifi.conf @@ -37,7 +37,7 @@ CONFIG_DK_LIBRARY=n # Actual configs for the Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_NET_L2_WIFI_MGMT=y # Scan only using offload API diff --git a/samples/cellular/modem_shell/README.rst b/samples/cellular/modem_shell/README.rst index ade404af38c8..bc100dd2c92c 100644 --- a/samples/cellular/modem_shell/README.rst +++ b/samples/cellular/modem_shell/README.rst @@ -1066,13 +1066,13 @@ To program the certificates and connect to nRF Cloud, complete the following ste nRF91 Series DK with nRF7002 EK Wi-Fi support ============================================= -To build the MoSh sample for an nRF91 Series DK with nRF7002 EK Wi-Fi support, use the ``-DSHIELD=nrf7002ek``, ``-DEXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf``, ``-DSB_CONFIG_WIFI_NRF700X=y`` and ``-DSB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y`` options. +To build the MoSh sample for an nRF91 Series DK with nRF7002 EK Wi-Fi support, use the ``-DSHIELD=nrf7002ek``, ``-DEXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf``, ``-DSB_CONFIG_WIFI_NRF70=y`` and ``-DSB_CONFIG_WIFI_NRF70_SCAN_ONLY=y`` options. For example: .. parsed-literal:: :class: highlight - west build -p -b *board_target* -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf -DSB_CONFIG_WIFI_NRF700X=y -DSB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y + west build -p -b *board_target* -- -DSHIELD=nrf7002ek -DEXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf -DSB_CONFIG_WIFI_NRF70=y -DSB_CONFIG_WIFI_NRF70_SCAN_ONLY=y |board_target| @@ -1081,12 +1081,12 @@ See :ref:`cmake_options` for more instructions on how to add these options. Thingy:91 X Wi-Fi support ========================= -To build the MoSh sample with Thingy:91 X Wi-Fi support, use the ``-DDTC_OVERLAY_FILE=thingy91x_wifi.overlay``, ``-DEXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf``, ``-DSB_CONFIG_WIFI_NRF700X=y``, and ``-DSB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y`` options. +To build the MoSh sample with Thingy:91 X Wi-Fi support, use the ``-DDTC_OVERLAY_FILE=thingy91x_wifi.overlay``, ``-DEXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf``, ``-DSB_CONFIG_WIFI_NRF70=y``, and ``-DSB_CONFIG_WIFI_NRF70_SCAN_ONLY=y`` options. For example: .. code-block:: console - west build -p -b thingy91x/nrf9151/ns -- -DDTC_OVERLAY_FILE=thingy91x_wifi.overlay -DEXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf -DSB_CONFIG_WIFI_NRF700X=y -DSB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y + west build -p -b thingy91x/nrf9151/ns -- -DDTC_OVERLAY_FILE=thingy91x_wifi.overlay -DEXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf -DSB_CONFIG_WIFI_NRF70=y -DSB_CONFIG_WIFI_NRF70_SCAN_ONLY=y See :ref:`cmake_options` for more instructions on how to add these options. diff --git a/samples/cellular/modem_shell/overlay-nrf700x-wifi-scan-only.conf b/samples/cellular/modem_shell/overlay-nrf700x-wifi-scan-only.conf index 0f363595f258..68726dca5305 100644 --- a/samples/cellular/modem_shell/overlay-nrf700x-wifi-scan-only.conf +++ b/samples/cellular/modem_shell/overlay-nrf700x-wifi-scan-only.conf @@ -31,8 +31,8 @@ CONFIG_MOSH_CURL=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. # Also see comments for CONFIG_HEAP_MEM_POOL_SIZE. CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT=50 diff --git a/samples/cellular/modem_shell/sample.yaml b/samples/cellular/modem_shell/sample.yaml index 1f25b1802bbc..9f44090c16c9 100644 --- a/samples/cellular/modem_shell/sample.yaml +++ b/samples/cellular/modem_shell/sample.yaml @@ -96,7 +96,7 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf700x-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_samples_cellular sample.cellular.modem_shell.nrf7000ek_wifi: sysbuild: true @@ -110,8 +110,8 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7000 EXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf - CONFIG_WPA_SUPP=n SB_CONFIG_WIFI_NRF700X=y - SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y + CONFIG_WPA_SUPP=n SB_CONFIG_WIFI_NRF70=y + SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y tags: ci_build sysbuild ci_samples_cellular sample.cellular.modem_shell.nrf7001ek_wifi: sysbuild: true @@ -125,7 +125,7 @@ tests: - nrf9160dk/nrf9160/ns - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek_nrf7001 EXTRA_CONF_FILE=overlay-nrf700x-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_samples_cellular sample.cellular.modem_shell.nrf7002ek_wifi-debug: sysbuild: true @@ -140,7 +140,7 @@ tests: - nrf9161dk/nrf9161/ns extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-nrf700x-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_samples_cellular sample.cellular.modem_shell.app_fota: sysbuild: true @@ -271,7 +271,7 @@ tests: - CONFIG_NRF_CLOUD_PGPS_TRANSPORT_NONE=y extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE="overlay-cloud_mqtt.conf;overlay-pgps.conf;overlay-nrf700x-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 integration_platforms: - nrf9151dk/nrf9151/ns - nrf9160dk/nrf9160/ns @@ -334,7 +334,7 @@ tests: - thingy91x/nrf9151/ns extra_args: EXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf DTC_OVERLAY_FILE=thingy91x_wifi.overlay - 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_samples_cellular sample.cellular.modem_shell.modem_trace_shell_ext_flash: sysbuild: true @@ -382,7 +382,7 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=n - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf700x-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_samples_cellular sample.cellular.modem_shell.location_wifi_cellular_no_gnss: sysbuild: true @@ -400,7 +400,7 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf700x-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_samples_cellular sample.cellular.modem_shell.location_wifi_no_cellular_no_gnss: sysbuild: true @@ -418,7 +418,7 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=n - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf700x-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_samples_cellular sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular: sysbuild: true @@ -471,7 +471,7 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf700x-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_samples_cellular sample.cellular.modem_shell.location_gnss_no_wifi_no_cellular_details: sysbuild: true @@ -507,7 +507,7 @@ tests: - CONFIG_LOCATION_METHOD_CELLULAR=y - CONFIG_LOCATION_METHOD_WIFI=y extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-nrf700x-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_samples_cellular sample.cellular.modem_shell.location_gnss_cellular_no_wifi_details: sysbuild: true diff --git a/samples/cellular/nrf_cloud_multi_service/overlay-nrf7002ek-wifi-scan-only.conf b/samples/cellular/nrf_cloud_multi_service/overlay-nrf7002ek-wifi-scan-only.conf index 3ee50a1f7c46..77cdc2bd5d55 100644 --- a/samples/cellular/nrf_cloud_multi_service/overlay-nrf7002ek-wifi-scan-only.conf +++ b/samples/cellular/nrf_cloud_multi_service/overlay-nrf7002ek-wifi-scan-only.conf @@ -16,8 +16,8 @@ CONFIG_LOCATION_WORKQUEUE_STACK_SIZE=8192 # Enable Wi-Fi drivers 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. # Also see comments for CONFIG_HEAP_MEM_POOL_SIZE. CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT=10 diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_coap_no_lte.conf b/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_coap_no_lte.conf index de848dd95c58..d6a6f8780b0b 100644 --- a/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_coap_no_lte.conf +++ b/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_coap_no_lte.conf @@ -98,8 +98,8 @@ CONFIG_NET_SOCKETS_DNS_TIMEOUT=30000 ## Enable Wi-Fi drivers, (and the native NET stack so that the location library can access them) 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 ## Enable Wi-Fi conn_mgr bindings CONFIG_L2_WIFI_CONNECTIVITY=y diff --git a/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_mqtt_no_lte.conf b/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_mqtt_no_lte.conf index b9b8da5cdb0f..89ee61bc2d84 100644 --- a/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_mqtt_no_lte.conf +++ b/samples/cellular/nrf_cloud_multi_service/overlay_nrf700x_wifi_mqtt_no_lte.conf @@ -97,8 +97,8 @@ CONFIG_NET_SOCKETS_DNS_TIMEOUT=30000 ## Enable Wi-Fi drivers, (and the native NET stack so that the location library can access them) 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 ## Enable Wi-Fi conn_mgr bindings CONFIG_L2_WIFI_CONNECTIVITY=y diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-conn.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-conn.conf index e7faf6f71cc4..4d19da213751 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-conn.conf +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-conn.conf @@ -4,8 +4,8 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y -SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=n +SB_CONFIG_WIFI_NRF70=y +SB_CONFIG_WIFI_NRF70_SCAN_ONLY=n # MCUboot disabled for Wi-Fi connectivity builds in order to save flash SB_CONFIG_BOOTLOADER_NONE=y diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-scan.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-scan.conf index 09662438152d..66837a35384d 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-scan.conf +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild_nrf700x-wifi-scan.conf @@ -4,8 +4,8 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y -SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y +SB_CONFIG_WIFI_NRF70=y +SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y # MCUboot enabled for scan-only Wi-Fi builds SB_CONFIG_BOOTLOADER_MCUBOOT=y diff --git a/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf index 7699fc95b93a..32db8ab62f32 100644 --- a/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf +++ b/samples/debug/memfault/boards/nrf7002dk_nrf5340_cpuapp.conf @@ -55,8 +55,8 @@ CONFIG_NET_TC_TX_COUNT=1 # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y -CONFIG_WIFI_NRF700X_LOG_LEVEL_ERR=y +CONFIG_WIFI_NRF70=y +CONFIG_WIFI_NRF70_LOG_LEVEL_ERR=y CONFIG_WIFI_MGMT_EXT=y CONFIG_NET_L2_WIFI_SHELL=y CONFIG_NET_SHELL=y diff --git a/samples/matter/common/src/dfu/ota/ota_image_processor_base_impl.h b/samples/matter/common/src/dfu/ota/ota_image_processor_base_impl.h index 8a56a4449989..209658e5703f 100644 --- a/samples/matter/common/src/dfu/ota/ota_image_processor_base_impl.h +++ b/samples/matter/common/src/dfu/ota/ota_image_processor_base_impl.h @@ -6,10 +6,10 @@ #pragma once -#ifdef CONFIG_WIFI_NRF700X +#ifdef CONFIG_WIFI_NRF70 #include using OTAImageProcessorBaseImpl = chip::DeviceLayer::OTAImageProcessorImplWiFi; #else #include using OTAImageProcessorBaseImpl = chip::DeviceLayer::OTAImageProcessorImpl; -#endif /* CONFIG_WIFI_NRF700X */ +#endif /* CONFIG_WIFI_NRF70 */ diff --git a/samples/matter/light_bulb/Kconfig.sysbuild b/samples/matter/light_bulb/Kconfig.sysbuild index de94c227ac19..f31a4153c194 100644 --- a/samples/matter/light_bulb/Kconfig.sysbuild +++ b/samples/matter/light_bulb/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 SOC_SERIES_NRF53X && !WIFI_NRF700X + default y if SOC_SERIES_NRF53X && !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/samples/matter/light_switch/Kconfig.sysbuild b/samples/matter/light_switch/Kconfig.sysbuild index de94c227ac19..f31a4153c194 100644 --- a/samples/matter/light_switch/Kconfig.sysbuild +++ b/samples/matter/light_switch/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 SOC_SERIES_NRF53X && !WIFI_NRF700X + default y if SOC_SERIES_NRF53X && !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/samples/matter/lock/Kconfig.sysbuild b/samples/matter/lock/Kconfig.sysbuild index 0456fc6af5ca..fa947ed46004 100644 --- a/samples/matter/lock/Kconfig.sysbuild +++ b/samples/matter/lock/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 (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !WIFI_NRF700X + default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !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/samples/matter/lock/README.rst b/samples/matter/lock/README.rst index cc61cfa26b58..2b8298851e88 100644 --- a/samples/matter/lock/README.rst +++ b/samples/matter/lock/README.rst @@ -134,7 +134,7 @@ For example: .. code-block:: console - west build -b nrf5340dk/nrf5340/cpuapp -p -- -Dlock_SHIELD=nrf7002ek -Dipc_radio_SHIELD=nrf7002ek_coex -DFILE_SUFFIX=thread_wifi_switched -DSB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE=y -DSB_CONFIG_MCUBOOT_UPDATEABLE_IMAGES=3 -DCONFIG_CHIP_DFU_OVER_BT_SMP=y -DSB_CONFIG_WIFI_NRF700X=y -DSB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y + west build -b nrf5340dk/nrf5340/cpuapp -p -- -Dlock_SHIELD=nrf7002ek -Dipc_radio_SHIELD=nrf7002ek_coex -DFILE_SUFFIX=thread_wifi_switched -DSB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE=y -DSB_CONFIG_MCUBOOT_UPDATEABLE_IMAGES=3 -DCONFIG_CHIP_DFU_OVER_BT_SMP=y -DSB_CONFIG_WIFI_NRF70=y -DSB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y .. _matter_lock_sample_ble_nus: @@ -441,7 +441,7 @@ See `Configuration`_ for information about building the sample with the DFU supp .. code-block:: console - west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF700X=y -DCONFIG_CHIP_WIFI=y -Dlock_SHIELD=nrf700x_nrf54h20dk + west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dlock_SHIELD=nrf700x_nrf54h20dk Selecting a configuration ========================= @@ -773,7 +773,7 @@ To test this feature, complete the following steps: .. code-block:: console - west build -b nrf5340dk/nrf5340/cpuapp -- -DFILE_SUFFIX=thread_wifi_switched -Dlock_SHIELD=nrf7002ek -Dipc_radio_SHIELD=nrf7002ek_coex -DSB_CONFIG_WIFI_NRF700X=y + west build -b nrf5340dk/nrf5340/cpuapp -- -DFILE_SUFFIX=thread_wifi_switched -Dlock_SHIELD=nrf7002ek -Dipc_radio_SHIELD=nrf7002ek_coex -DSB_CONFIG_WIFI_NRF70=y #. |connect_terminal_ANSI| #. Program the application to the kit using the following command: diff --git a/samples/matter/lock/sample.yaml b/samples/matter/lock/sample.yaml index 6bde017accb2..b29a6a124cdd 100644 --- a/samples/matter/lock/sample.yaml +++ b/samples/matter/lock/sample.yaml @@ -72,7 +72,7 @@ tests: extra_args: lock_SHIELD=nrf7002ek multiprotocol_rpmsg_SHIELD=nrf7002ek_coex FILE_SUFFIX=thread_wifi_switched SB_CONFIG_WIFI_PATCHES_EXT_FLASH_STORE=y SB_CONFIG_MCUBOOT_UPDATEABLE_IMAGES=3 CONFIG_CHIP_DFU_OVER_BT_SMP=y - SB_CONFIG_WIFI_NRF700X=y SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y + SB_CONFIG_WIFI_NRF70=y SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH=y integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp diff --git a/samples/matter/template/Kconfig.sysbuild b/samples/matter/template/Kconfig.sysbuild index 0456fc6af5ca..fa947ed46004 100644 --- a/samples/matter/template/Kconfig.sysbuild +++ b/samples/matter/template/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 (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !WIFI_NRF700X + default y if (SOC_SERIES_NRF53X || SOC_SERIES_NRF54HX) && !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/samples/matter/template/README.rst b/samples/matter/template/README.rst index 1b6db0b626af..425a611005c6 100644 --- a/samples/matter/template/README.rst +++ b/samples/matter/template/README.rst @@ -202,7 +202,7 @@ To use nrf54H20 DK with the ``nrf7002ek`` shield attached (2.4 GHz or 5 GHz), fo .. code-block:: console - west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF700X=y -DCONFIG_CHIP_WIFI=y -Dtemplate_SHIELD=nrf700x_nrf54h20dk + west build -b nrf54h20dk/nrf54h20/cpuapp -p -- -DSB_CONFIG_WIFI_NRF70=y -DCONFIG_CHIP_WIFI=y -Dtemplate_SHIELD=nrf700x_nrf54h20dk Selecting a configuration ========================= diff --git a/samples/matter/template/sample.yaml b/samples/matter/template/sample.yaml index 77671609ab84..584cdd3fd938 100644 --- a/samples/matter/template/sample.yaml +++ b/samples/matter/template/sample.yaml @@ -62,7 +62,7 @@ tests: sample.matter.template.nrf54h20.nrf7002eb: sysbuild: true build_only: true - extra_args: SB_CONFIG_WIFI_NRF700X=y template_SHIELD=nrf700x_nrf54h20dk + extra_args: SB_CONFIG_WIFI_NRF70=y template_SHIELD=nrf700x_nrf54h20dk CONFIG_CHIP_WIFI=y CONFIG_CHIP_BOOTLOADER_NONE=y CONFIG_CHIP_OTA_REQUESTOR=n SB_CONFIG_MATTER_OTA=n CONFIG_LTO=y CONFIG_ISR_TABLES_LOCAL_DECLARATION=y diff --git a/samples/matter/thermostat/Kconfig.sysbuild b/samples/matter/thermostat/Kconfig.sysbuild index 0a0ecc365061..d250f1fc943f 100644 --- a/samples/matter/thermostat/Kconfig.sysbuild +++ b/samples/matter/thermostat/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 SOC_SERIES_NRF53X && !WIFI_NRF700X + default y if SOC_SERIES_NRF53X && !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/samples/matter/window_covering/Kconfig.sysbuild b/samples/matter/window_covering/Kconfig.sysbuild index de94c227ac19..f31a4153c194 100644 --- a/samples/matter/window_covering/Kconfig.sysbuild +++ b/samples/matter/window_covering/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 SOC_SERIES_NRF53X && !WIFI_NRF700X + default y if SOC_SERIES_NRF53X && !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/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index cccd88943313..a6cc39aa683d 100644 --- a/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/aws_iot/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -18,12 +18,12 @@ CONFIG_HW_ID_LIBRARY_SOURCE_NET_MAC=y CONFIG_POSIX_MAX_FDS=25 # Optimize Wi-Fi stack to save some memory -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_WIFI_MGMT_EXT=y CONFIG_WIFI_CREDENTIALS=y CONFIG_FLASH=y diff --git a/samples/net/azure_iot_hub/README.rst b/samples/net/azure_iot_hub/README.rst index b5243e45d0d4..0b547a26d7fc 100644 --- a/samples/net/azure_iot_hub/README.rst +++ b/samples/net/azure_iot_hub/README.rst @@ -260,5 +260,4 @@ It uses the following libraries and secure firmware component for nRF91 Series b It uses the following libraries for nRF7 Series builds: * :ref:`nrf_security` -* :ref:`nrf700x_wifi` * :ref:`lib_wifi_credentials` diff --git a/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index aa6f3a4f595d..28345e1b64a3 100644 --- a/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/azure_iot_hub/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -18,13 +18,13 @@ CONFIG_HEAP_MEM_POOL_SIZE=81920 CONFIG_NET_RX_STACK_SIZE=2048 # Optimize Wi-Fi stack to save some memory -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y -CONFIG_WIFI_NRF700X_LOG_LEVEL_ERR=y +CONFIG_WIFI_NRF70=y +CONFIG_WIFI_NRF70_LOG_LEVEL_ERR=y CONFIG_WIFI_MGMT_EXT=y CONFIG_WIFI_CREDENTIALS=y CONFIG_FLASH_PAGE_LAYOUT=y diff --git a/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index fea05a47d07e..1c5f9067a09e 100644 --- a/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/coap_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -19,12 +19,12 @@ CONFIG_PM_PARTITION_SIZE_TFM_SRAM=0xc000 CONFIG_PM_PARTITION_SIZE_TFM=0x20000 # Optimize Wi-Fi stack to save some memory -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_WIFI_MGMT_EXT=y CONFIG_WIFI_CREDENTIALS=y CONFIG_NET_L2_WIFI_SHELL=y diff --git a/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index a54ae580caa8..7dd2cd728096 100644 --- a/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -13,8 +13,8 @@ CONFIG_MAIN_STACK_SIZE=4096 CONFIG_LOG=y # Optimize Wi-Fi stack to save some memory -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # Zephyr NET Connection Manager connectivity layer. CONFIG_L2_WIFI_CONNECTIVITY=y @@ -23,8 +23,8 @@ CONFIG_L2_WIFI_CONNECTIVITY_AUTO_CONNECT=n # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y -CONFIG_WIFI_NRF700X_LOG_LEVEL_ERR=y +CONFIG_WIFI_NRF70=y +CONFIG_WIFI_NRF70_LOG_LEVEL_ERR=y CONFIG_WIFI_MGMT_EXT=y CONFIG_WIFI_CREDENTIALS=y diff --git a/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index 2dbbe74ae62a..1e011480db61 100644 --- a/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/http_server/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -11,12 +11,12 @@ CONFIG_PM_PARTITION_SIZE_TFM=0x20000 # Optimize Wi-Fi stack to save some memory CONFIG_HEAP_MEM_POOL_SIZE=81920 -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_WPA_SUPP=y CONFIG_NET_L2_ETHERNET=y diff --git a/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index bd12d2ed3a83..9bed9d0074cc 100644 --- a/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/https_client/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -11,13 +11,13 @@ CONFIG_HEAP_MEM_POOL_SIZE=81920 CONFIG_NET_RX_STACK_SIZE=2048 # Optimize Wi-Fi stack to save some memory -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y -CONFIG_WIFI_NRF700X_LOG_LEVEL_ERR=y +CONFIG_WIFI_NRF70=y +CONFIG_WIFI_NRF70_LOG_LEVEL_ERR=y CONFIG_WIFI_MGMT_EXT=y CONFIG_WIFI_CREDENTIALS=y diff --git a/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index 5c51873853a3..45edaeb3fa3d 100644 --- a/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/mqtt/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -19,13 +19,13 @@ CONFIG_HW_ID_LIBRARY_SOURCE_NET_MAC=y CONFIG_DK_LIBRARY=y # Optimize Wi-Fi stack to save some memory -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y -CONFIG_WIFI_NRF700X_LOG_LEVEL_ERR=y +CONFIG_WIFI_NRF70=y +CONFIG_WIFI_NRF70_LOG_LEVEL_ERR=y CONFIG_WIFI_MGMT_EXT=y CONFIG_WIFI_CREDENTIALS=y diff --git a/samples/net/mqtt/src/modules/network/Kconfig.network b/samples/net/mqtt/src/modules/network/Kconfig.network index 0e9d52ed7578..ec0d7ae21822 100644 --- a/samples/net/mqtt/src/modules/network/Kconfig.network +++ b/samples/net/mqtt/src/modules/network/Kconfig.network @@ -5,7 +5,7 @@ # menu "Network" - depends on NRF_MODEM_LIB_NET_IF || (WIFI_NRF700X && WIFI_MGMT_EXT) || BOARD_NATIVE_SIM + depends on NRF_MODEM_LIB_NET_IF || (WIFI_NRF70 && WIFI_MGMT_EXT) || BOARD_NATIVE_SIM config MQTT_SAMPLE_NETWORK_THREAD_STACK_SIZE int "Thread stack size" diff --git a/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf b/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf index ccdd2b1f86b3..cafcf374f7da 100644 --- a/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf +++ b/samples/net/udp/boards/nrf7002dk_nrf5340_cpuapp_ns.conf @@ -10,13 +10,13 @@ CONFIG_HEAP_MEM_POOL_SIZE=81920 # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_WIFI_MGMT_EXT=y CONFIG_WIFI_CREDENTIALS=y # Optimize Wi-Fi stack to save some memory -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # Shell CONFIG_SHELL=y diff --git a/samples/wifi/ble_coex/prj.conf b/samples/wifi/ble_coex/prj.conf index ac8185c69583..dab141cf094e 100644 --- a/samples/wifi/ble_coex/prj.conf +++ b/samples/wifi/ble_coex/prj.conf @@ -5,7 +5,7 @@ # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y # WPA supplicant CONFIG_WPA_SUPP=y @@ -110,8 +110,8 @@ CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y CONFIG_DK_LIBRARY=y CONFIG_DK_LIBRARY_DYNAMIC_BUTTON_HANDLERS=y -CONFIG_NRF700X_MAX_TX_PENDING_QLEN=12 -CONFIG_NRF700X_QSPI_LOW_POWER=n +CONFIG_NRF70_MAX_TX_PENDING_QLEN=12 +CONFIG_NRF70_QSPI_LOW_POWER=n #Added to fix BLE crash in coex enable cases. CONFIG_NRF_RPC=n diff --git a/samples/wifi/ble_coex/src/main.c b/samples/wifi/ble_coex/src/main.c index 0c362b48eb16..782ca2d73732 100644 --- a/samples/wifi/ble_coex/src/main.c +++ b/samples/wifi/ble_coex/src/main.c @@ -332,10 +332,10 @@ int main(void) int ret = 0; bool test_wlan = IS_ENABLED(CONFIG_TEST_TYPE_WLAN); bool test_ble = IS_ENABLED(CONFIG_TEST_TYPE_BLE); -#ifdef CONFIG_NRF700X_SR_COEX +#ifdef CONFIG_NRF70_SR_COEX enum nrf_wifi_pta_wlan_op_band wlan_band; bool separate_antennas = IS_ENABLED(CONFIG_COEX_SEP_ANTENNAS); -#endif /* CONFIG_NRF700X_SR_COEX */ +#endif /* CONFIG_NRF70_SR_COEX */ bool is_sr_protocol_ble = IS_ENABLED(CONFIG_SR_PROTOCOL_BLE); #if !defined(CONFIG_COEX_SEP_ANTENNAS) && \ @@ -368,14 +368,14 @@ int main(void) LOG_INF("test_wlan = %d and test_ble = %d\n", test_wlan, test_ble); -#ifdef CONFIG_NRF700X_SR_COEX_RF_SWITCH +#ifdef CONFIG_NRF70_SR_COEX_RF_SWITCH /* Configure SR side (nRF5340 side) switch for nRF700x DK */ ret = nrf_wifi_config_sr_switch(separate_antennas); if (ret != 0) { LOG_ERR("Unable to configure SR side switch: %d\n", ret); goto err; } -#endif /* CONFIG_NRF700X_SR_COEX_RF_SWITCH */ +#endif /* CONFIG_NRF70_SR_COEX_RF_SWITCH */ if (test_wlan) { /* Wi-Fi connection */ @@ -389,7 +389,7 @@ int main(void) goto err; } -#ifdef CONFIG_NRF700X_SR_COEX +#ifdef CONFIG_NRF70_SR_COEX /* Configure Coexistence Hardware */ LOG_INF("\n"); LOG_INF("Configuring non-PTA registers.\n"); @@ -411,7 +411,7 @@ int main(void) LOG_ERR("Failed to configure PTA coex hardware: %d\n", ret); goto err; } -#endif /* CONFIG_NRF700X_SR_COEX */ +#endif /* CONFIG_NRF70_SR_COEX */ } if (test_ble) { diff --git a/samples/wifi/ble_coex/sysbuild.conf b/samples/wifi/ble_coex/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/ble_coex/sysbuild.conf +++ b/samples/wifi/ble_coex/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/samples/wifi/monitor/prj.conf b/samples/wifi/monitor/prj.conf index 1e6270728cd2..6f064ed5626a 100644 --- a/samples/wifi/monitor/prj.conf +++ b/samples/wifi/monitor/prj.conf @@ -4,11 +4,11 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_NRF_WIFI_LOW_POWER=n # Enable raw data RX for nRF700x for monitor mode -CONFIG_NRF700X_RAW_DATA_RX=y +CONFIG_NRF70_RAW_DATA_RX=y # WPA supplicant CONFIG_WPA_SUPP=y diff --git a/samples/wifi/monitor/sysbuild.conf b/samples/wifi/monitor/sysbuild.conf index 9baef711d1ff..7a8ca50b9fb0 100644 --- a/samples/wifi/monitor/sysbuild.conf +++ b/samples/wifi/monitor/sysbuild.conf @@ -4,5 +4,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y -SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES=y +SB_CONFIG_WIFI_NRF70=y +SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES=y diff --git a/samples/wifi/promiscuous/prj.conf b/samples/wifi/promiscuous/prj.conf index c960d27ab7a1..cda26d268723 100644 --- a/samples/wifi/promiscuous/prj.conf +++ b/samples/wifi/promiscuous/prj.conf @@ -4,14 +4,14 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y # WPA supplicant CONFIG_WPA_SUPP=y # Promiscuous mode CONFIG_NET_PROMISCUOUS_MODE=y -CONFIG_NRF700X_PROMISC_DATA_RX=y +CONFIG_NRF70_PROMISC_DATA_RX=y CONFIG_WIFI_MGMT_EXT=y CONFIG_WIFI_CREDENTIALS=y diff --git a/samples/wifi/promiscuous/sysbuild.conf b/samples/wifi/promiscuous/sysbuild.conf index 9baef711d1ff..7a8ca50b9fb0 100644 --- a/samples/wifi/promiscuous/sysbuild.conf +++ b/samples/wifi/promiscuous/sysbuild.conf @@ -4,5 +4,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y -SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES=y +SB_CONFIG_WIFI_NRF70=y +SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES=y diff --git a/samples/wifi/provisioning/ble/prj.conf b/samples/wifi/provisioning/ble/prj.conf index a31ca1ea07cf..a3e456bdf29c 100644 --- a/samples/wifi/provisioning/ble/prj.conf +++ b/samples/wifi/provisioning/ble/prj.conf @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y # WPA supplicant CONFIG_WPA_SUPP=y diff --git a/samples/wifi/provisioning/ble/sysbuild.conf b/samples/wifi/provisioning/ble/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/provisioning/ble/sysbuild.conf +++ b/samples/wifi/provisioning/ble/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/samples/wifi/provisioning/softap/prj.conf b/samples/wifi/provisioning/softap/prj.conf index bed3bb262534..d2a7dcd2e3de 100644 --- a/samples/wifi/provisioning/softap/prj.conf +++ b/samples/wifi/provisioning/softap/prj.conf @@ -11,13 +11,13 @@ CONFIG_PM_PARTITION_SIZE_TFM=0x1c000 # Optimize Wi-Fi stack to save some memory. CONFIG_HEAP_MEM_POOL_SIZE=81920 -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # Wi-Fi CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y -CONFIG_NRF700X_AP_MODE=y +CONFIG_WIFI_NRF70=y +CONFIG_NRF70_AP_MODE=y CONFIG_WPA_SUPP=y CONFIG_WPA_SUPP_AP=y CONFIG_NET_L2_ETHERNET=y diff --git a/samples/wifi/radio_test/prj.conf b/samples/wifi/radio_test/prj.conf index 5039b7c6d249..efc2ad3aeca1 100644 --- a/samples/wifi/radio_test/prj.conf +++ b/samples/wifi/radio_test/prj.conf @@ -4,8 +4,8 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y -CONFIG_NRF700X_RADIO_TEST=y +CONFIG_WIFI_NRF70=y +CONFIG_NRF70_RADIO_TEST=y #CONFIG_INIT_STACKS=y diff --git a/samples/wifi/radio_test/sample.yaml b/samples/wifi/radio_test/sample.yaml index 112ac3e8a6fd..98d582af81d2 100644 --- a/samples/wifi/radio_test/sample.yaml +++ b/samples/wifi/radio_test/sample.yaml @@ -21,7 +21,7 @@ tests: sample.nrf7002.radio_test_combo: sysbuild: true build_only: true - extra_args: CONFIG_NRF700X_RADIO_TEST_COMBO=y + extra_args: CONFIG_NRF70_RADIO_TEST_COMBO=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp @@ -29,7 +29,7 @@ tests: sample.nrf5340.radio_test_combo: sysbuild: true build_only: true - extra_args: SHIELD=nrf7002ek CONFIG_NRF700X_RADIO_TEST_COMBO=y + extra_args: SHIELD=nrf7002ek CONFIG_NRF70_RADIO_TEST_COMBO=y integration_platforms: - nrf5340dk/nrf5340/cpuapp platform_allow: nrf5340dk/nrf5340/cpuapp diff --git a/samples/wifi/radio_test/src/nrf_wifi_radio_test_shell.c b/samples/wifi/radio_test/src/nrf_wifi_radio_test_shell.c index fb82256c44d8..a7ac1adcbc1f 100644 --- a/samples/wifi/radio_test/src/nrf_wifi_radio_test_shell.c +++ b/samples/wifi/radio_test/src/nrf_wifi_radio_test_shell.c @@ -1376,7 +1376,7 @@ static int nrf_wifi_radio_test_set_rx(const struct shell *shell, return 0; } -#ifdef CONFIG_NRF700X_SR_COEX_RF_SWITCH +#ifdef CONFIG_NRF70_SR_COEX_RF_SWITCH static int nrf_wifi_radio_test_sr_ant_switch_ctrl(const struct shell *shell, size_t argc, const char *argv[]) @@ -1394,7 +1394,7 @@ static int nrf_wifi_radio_test_sr_ant_switch_ctrl(const struct shell *shell, return sr_ant_switch(val); } -#endif /* CONFIG_NRF700X_SR_COEX_RF_SWITCH */ +#endif /* CONFIG_NRF70_SR_COEX_RF_SWITCH */ static int nrf_wifi_radio_test_rx_cap(const struct shell *shell, size_t argc, @@ -2379,7 +2379,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE( nrf_wifi_radio_test_set_rx, 2, 0), -#ifdef CONFIG_NRF700X_SR_COEX_RF_SWITCH +#ifdef CONFIG_NRF70_SR_COEX_RF_SWITCH SHELL_CMD_ARG(sr_ant_switch_ctrl, NULL, "0 - Switch set to use the BLE antenna\n" @@ -2387,7 +2387,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE( nrf_wifi_radio_test_sr_ant_switch_ctrl, 2, 0), -#endif /* CONFIG_NRF700X_SR_COEX_RF_SWITCH */ +#endif /* CONFIG_NRF70_SR_COEX_RF_SWITCH */ SHELL_CMD_ARG(rx_lna_gain, NULL, " - LNA gain to be configured.\n" diff --git a/samples/wifi/radio_test/sysbuild.conf b/samples/wifi/radio_test/sysbuild.conf index 30e84c648c69..a5af2663d0db 100644 --- a/samples/wifi/radio_test/sysbuild.conf +++ b/samples/wifi/radio_test/sysbuild.conf @@ -4,5 +4,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y -SB_CONFIG_WIFI_NRF700X_RADIO_TEST=y +SB_CONFIG_WIFI_NRF70=y +SB_CONFIG_WIFI_NRF70_RADIO_TEST=y diff --git a/samples/wifi/raw_tx_packet/prj.conf b/samples/wifi/raw_tx_packet/prj.conf index 2742f7e34616..0d8a54cbea87 100644 --- a/samples/wifi/raw_tx_packet/prj.conf +++ b/samples/wifi/raw_tx_packet/prj.conf @@ -4,9 +4,9 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_NRF_WIFI_LOW_POWER=n -CONFIG_NRF700X_RAW_DATA_TX=y +CONFIG_NRF70_RAW_DATA_TX=y # WPA supplicant CONFIG_WPA_SUPP=y diff --git a/samples/wifi/raw_tx_packet/sysbuild.conf b/samples/wifi/raw_tx_packet/sysbuild.conf index 9baef711d1ff..7a8ca50b9fb0 100644 --- a/samples/wifi/raw_tx_packet/sysbuild.conf +++ b/samples/wifi/raw_tx_packet/sysbuild.conf @@ -4,5 +4,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y -SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES=y +SB_CONFIG_WIFI_NRF70=y +SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES=y diff --git a/samples/wifi/scan/prj.conf b/samples/wifi/scan/prj.conf index 5087fe476d79..7edae9f7b7bb 100644 --- a/samples/wifi/scan/prj.conf +++ b/samples/wifi/scan/prj.conf @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_NET_L2_WIFI_MGMT=y CONFIG_HEAP_MEM_POOL_SIZE=25000 diff --git a/samples/wifi/scan/src/main.c b/samples/wifi/scan/src/main.c index 7598675f8a9f..5bcfdea2a4d5 100644 --- a/samples/wifi/scan/src/main.c +++ b/samples/wifi/scan/src/main.c @@ -106,13 +106,13 @@ static struct net_mgmt_event_callback wifi_shell_mgmt_cb; K_SEM_DEFINE(scan_sem, 0, 1); -#if defined CONFIG_WIFI_NRF700X_SKIP_LOCAL_ADMIN_MAC +#if defined CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC static bool local_mac_check(const uint8_t *const mac) { return ((mac[0] & 0x02) || ((mac[0] == 0x00) && (mac[1] == 0x00) && (mac[2] == 0x5E))); } -#endif /* CONFIG_WIFI_NRF700X_SKIP_LOCAL_ADMIN_MAC */ +#endif /* CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC */ static void handle_wifi_scan_result(struct net_mgmt_event_callback *cb) { @@ -131,9 +131,9 @@ static void handle_wifi_scan_result(struct net_mgmt_event_callback *cb) strncpy(ssid_print, entry->ssid, sizeof(ssid_print) - 1); ssid_print[sizeof(ssid_print) - 1] = '\0'; -#if defined CONFIG_WIFI_NRF700X_SKIP_LOCAL_ADMIN_MAC +#if defined CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC __ASSERT(!local_mac_check(entry->mac), "Locally administered MAC found: %s\n", ssid_print); -#endif /* CONFIG_WIFI_NRF700X_SKIP_LOCAL_ADMIN_MAC */ +#endif /* CONFIG_WIFI_NRF70_SKIP_LOCAL_ADMIN_MAC */ printk("%-4d | %-32s %-5u | %-4u | %-4d | %-5s | %s\n", scan_result, ssid_print, entry->ssid_length, diff --git a/samples/wifi/scan/sysbuild.conf b/samples/wifi/scan/sysbuild.conf index cb753f32ccc8..1f6da431255e 100644 --- a/samples/wifi/scan/sysbuild.conf +++ b/samples/wifi/scan/sysbuild.conf @@ -4,5 +4,5 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y -SB_CONFIG_WIFI_NRF700X_SCAN_ONLY=y +SB_CONFIG_WIFI_NRF70=y +SB_CONFIG_WIFI_NRF70_SCAN_ONLY=y diff --git a/samples/wifi/shell/CMakeLists.txt b/samples/wifi/shell/CMakeLists.txt index 3d5156b65943..a0230bfd1857 100644 --- a/samples/wifi/shell/CMakeLists.txt +++ b/samples/wifi/shell/CMakeLists.txt @@ -14,12 +14,12 @@ target_include_directories( PRIVATE ${ZEPHYR_BASE}/../nrfxlib/) -target_sources_ifdef(CONFIG_NRF700X_RAW_DATA_TX +target_sources_ifdef(CONFIG_NRF70_RAW_DATA_TX app PRIVATE src/wifi_raw_tx_pkt_shell.c) -target_sources_ifdef(CONFIG_NRF700X_PROMISC_DATA_RX +target_sources_ifdef(CONFIG_NRF70_PROMISC_DATA_RX app PRIVATE src/wifi_promiscuous_shell.c) diff --git a/samples/wifi/shell/overlay-monitor-mode.conf b/samples/wifi/shell/overlay-monitor-mode.conf index a226a8f96db5..ca380ef6d797 100644 --- a/samples/wifi/shell/overlay-monitor-mode.conf +++ b/samples/wifi/shell/overlay-monitor-mode.conf @@ -1 +1 @@ -CONFIG_NRF700X_RAW_DATA_RX=y +CONFIG_NRF70_RAW_DATA_RX=y diff --git a/samples/wifi/shell/overlay-promiscuous-mode.conf b/samples/wifi/shell/overlay-promiscuous-mode.conf index f2b161fc5f8c..7c43d074c396 100644 --- a/samples/wifi/shell/overlay-promiscuous-mode.conf +++ b/samples/wifi/shell/overlay-promiscuous-mode.conf @@ -1,2 +1,2 @@ -CONFIG_NRF700X_PROMISC_DATA_RX=y +CONFIG_NRF70_PROMISC_DATA_RX=y CONFIG_NET_PROMISCUOUS_MODE=y diff --git a/samples/wifi/shell/overlay-raw-tx.conf b/samples/wifi/shell/overlay-raw-tx.conf index db5853dc54bc..b7064ffcfd28 100644 --- a/samples/wifi/shell/overlay-raw-tx.conf +++ b/samples/wifi/shell/overlay-raw-tx.conf @@ -1,2 +1,2 @@ -CONFIG_NRF700X_RAW_DATA_TX=y +CONFIG_NRF70_RAW_DATA_TX=y CONFIG_LOG_MODE_IMMEDIATE=y diff --git a/samples/wifi/shell/overlay-sap.conf b/samples/wifi/shell/overlay-sap.conf index 7d1bdc32b529..5d98cdc2f405 100644 --- a/samples/wifi/shell/overlay-sap.conf +++ b/samples/wifi/shell/overlay-sap.conf @@ -1,4 +1,4 @@ -CONFIG_NRF700X_AP_MODE=y +CONFIG_NRF70_AP_MODE=y CONFIG_WPA_SUPP_AP=y CONFIG_NET_ZPERF=y @@ -10,7 +10,7 @@ CONFIG_NET_BUF_RX_COUNT=10 CONFIG_NET_BUF_TX_COUNT=20 CONFIG_HEAP_MEM_POOL_SIZE=180000 CONFIG_NET_BUF_DATA_SIZE=1500 -CONFIG_NRF700X_QSPI_LOW_POWER=n +CONFIG_NRF70_QSPI_LOW_POWER=n CONFIG_NET_ZPERF_MAX_PACKET_SIZE=1500 # Necessary for zperf_tcp_receiver.c diff --git a/samples/wifi/shell/overlay-zperf.conf b/samples/wifi/shell/overlay-zperf.conf index 885a9e3e2fa4..fc06590d4525 100644 --- a/samples/wifi/shell/overlay-zperf.conf +++ b/samples/wifi/shell/overlay-zperf.conf @@ -14,7 +14,7 @@ CONFIG_NET_BUF_RX_COUNT=30 CONFIG_NET_BUF_TX_COUNT=58 CONFIG_HEAP_MEM_POOL_SIZE=230000 CONFIG_NET_BUF_DATA_SIZE=1100 -CONFIG_NRF700X_QSPI_LOW_POWER=n +CONFIG_NRF70_QSPI_LOW_POWER=n # To enable optimization configuration options CONFIG_PICOLIBC_USE_MODULE=y CONFIG_SPEED_OPTIMIZATIONS=y @@ -28,4 +28,4 @@ CONFIG_WIFI_CREDENTIALS=n CONFIG_FLASH=n CONFIG_NVS=n CONFIG_SETTINGS=n -CONFIG_NRF700X_UTIL=y +CONFIG_NRF70_UTIL=y diff --git a/samples/wifi/shell/prj.conf b/samples/wifi/shell/prj.conf index f3368d237e3c..b692b42e4cc6 100644 --- a/samples/wifi/shell/prj.conf +++ b/samples/wifi/shell/prj.conf @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y # WPA supplicant CONFIG_WPA_SUPP=y @@ -33,8 +33,8 @@ CONFIG_NET_PKT_TX_COUNT=8 CONFIG_NET_BUF_RX_COUNT=16 CONFIG_NET_BUF_TX_COUNT=16 CONFIG_NET_BUF_DATA_SIZE=128 -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # nRF700x is main consumer: (16 + 8) * 1600 = ~40KB + ~40KB control path (experimental) CONFIG_HEAP_MEM_POOL_SIZE=80000 CONFIG_NET_TC_TX_COUNT=1 diff --git a/samples/wifi/shell/sample.yaml b/samples/wifi/shell/sample.yaml index 927660662a62..924f403b8902 100644 --- a/samples/wifi/shell/sample.yaml +++ b/samples/wifi/shell/sample.yaml @@ -213,7 +213,7 @@ tests: build_only: true extra_args: EXTRA_CONF_FILE=overlay-zperf.conf - CONFIG_NRF700X_UTIL=y + CONFIG_NRF70_UTIL=y CONFIG_WPA_CLI=y CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 @@ -228,7 +228,7 @@ tests: extra_args: SHIELD=nrf7002ek_nrf7001 EXTRA_CONF_FILE=overlay-zperf.conf - CONFIG_NRF700X_UTIL=y + CONFIG_NRF70_UTIL=y CONFIG_WPA_CLI=y CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 @@ -242,7 +242,7 @@ tests: build_only: true extra_args: EXTRA_CONF_FILE=overlay-zperf.conf - CONFIG_NRF700X_UTIL=y + CONFIG_NRF70_UTIL=y CONFIG_WPA_CLI=y CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 @@ -257,7 +257,7 @@ tests: extra_args: SHIELD=nrf7002ek EXTRA_CONF_FILE=overlay-zperf.conf - CONFIG_NRF700X_UTIL=y + CONFIG_NRF70_UTIL=y CONFIG_WPA_CLI=y CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 @@ -271,7 +271,7 @@ tests: extra_args: nrf_wifi_shell_SNIPPET="nrf70-driver-verbose-debug;wpa-supplicant-debug" EXTRA_CONF_FILE=overlay-zperf.conf - CONFIG_NRF700X_UTIL=y + CONFIG_NRF70_UTIL=y CONFIG_WPA_CLI=y CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_PKT=24 @@ -292,7 +292,7 @@ tests: build_only: true extra_args: EXTRA_CONF_FILE=overlay-raw-tx.conf - SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES=y + SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp @@ -302,7 +302,7 @@ tests: build_only: true extra_args: EXTRA_CONF_FILE=overlay-monitor-mode.conf - SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES=y + SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp @@ -312,7 +312,7 @@ tests: build_only: true extra_args: EXTRA_CONF_FILE=overlay-promiscuous-mode.conf - SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES=y + SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES=y integration_platforms: - nrf7002dk/nrf5340/cpuapp platform_allow: nrf7002dk/nrf5340/cpuapp @@ -322,7 +322,7 @@ tests: build_only: true extra_args: EXTRA_CONF_FILE=overlay-promiscuous-mode.conf - SB_CONFIG_WIFI_NRF700X_SYSTEM_WITH_RAW_MODES=y + SB_CONFIG_WIFI_NRF70_SYSTEM_WITH_RAW_MODES=y integration_platforms: - nrf7002dk/nrf5340/cpuapp/nrf7001 platform_allow: nrf7002dk/nrf5340/cpuapp/nrf7001 diff --git a/samples/wifi/shell/sysbuild.conf b/samples/wifi/shell/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/shell/sysbuild.conf +++ b/samples/wifi/shell/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/samples/wifi/shutdown/prj.conf b/samples/wifi/shutdown/prj.conf index 36864978b084..bf679a42c729 100644 --- a/samples/wifi/shutdown/prj.conf +++ b/samples/wifi/shutdown/prj.conf @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_NET_L2_WIFI_MGMT=y CONFIG_HEAP_MEM_POOL_SIZE=25000 diff --git a/samples/wifi/shutdown/sysbuild.conf b/samples/wifi/shutdown/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/shutdown/sysbuild.conf +++ b/samples/wifi/shutdown/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/samples/wifi/softap/README.rst b/samples/wifi/softap/README.rst index 870351da6418..2896ca8e0000 100644 --- a/samples/wifi/softap/README.rst +++ b/samples/wifi/softap/README.rst @@ -25,7 +25,7 @@ Then, the sample lists the connected devices. You can enable the SoftAP mode by setting the below configuration options in the sample project configuration file: -* :kconfig:option:`CONFIG_NRF700X_AP_MODE`: Enables access point mode support. +* :kconfig:option:`CONFIG_NRF70_AP_MODE`: Enables access point mode support. * :kconfig:option:`CONFIG_WPA_SUPP_AP`: Enables access point support. The sample uses the :ref:`lib_wifi_ready` library to check Wi-Fi readiness. diff --git a/samples/wifi/softap/prj.conf b/samples/wifi/softap/prj.conf index f07532498438..25868db00547 100644 --- a/samples/wifi/softap/prj.conf +++ b/samples/wifi/softap/prj.conf @@ -4,14 +4,14 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y # WPA supplicant CONFIG_WPA_SUPP=y CONFIG_WIFI_READY_LIB=y # Soft AP -CONFIG_NRF700X_AP_MODE=y +CONFIG_NRF70_AP_MODE=y CONFIG_WPA_SUPP_AP=y CONFIG_WPA_SUPP_LOG_LEVEL_INF=y diff --git a/samples/wifi/softap/sysbuild.conf b/samples/wifi/softap/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/softap/sysbuild.conf +++ b/samples/wifi/softap/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/samples/wifi/sta/Kconfig b/samples/wifi/sta/Kconfig index 2f738998501e..be7900a68680 100644 --- a/samples/wifi/sta/Kconfig +++ b/samples/wifi/sta/Kconfig @@ -12,7 +12,7 @@ config CONNECTION_IDLE_TIMEOUT int "Time to be waited for a station to connect" default 30 -config NRF700X_QSPI_ENCRYPTION_KEY +config NRF70_QSPI_ENCRYPTION_KEY string "16 bytes QSPI encryption key, only for testing purposes" depends on BOARD_NRF7002DK_NRF5340_CPUAPP help diff --git a/samples/wifi/sta/README.rst b/samples/wifi/sta/README.rst index fed113b4ab54..6cf312358438 100644 --- a/samples/wifi/sta/README.rst +++ b/samples/wifi/sta/README.rst @@ -62,7 +62,7 @@ Quad Serial Peripheral Interface (QSPI) encryption ************************************************** This sample demonstrates QSPI encryption API usage. -You can set the key using the :kconfig:option:`CONFIG_NRF700X_QSPI_ENCRYPTION_KEY` Kconfig option. +You can set the key using the :kconfig:option:`CONFIG_NRF70_QSPI_ENCRYPTION_KEY` Kconfig option. If encryption of the QSPI traffic is required for the production devices, matching keys must be programmed in both the nRF7002 OTP and non-volatile storage associated with the host. The key from non-volatile storage must be set as the encryption key using the APIs. @@ -193,7 +193,7 @@ Application's network connection will be lost during the recovery process, and i Testing ======= -To test RPU recovery, you must build the sample with :kconfig:option:`CONFIG_SHELL` and :kconfig:option:`CONFIG_NRF700X_UTIL` Kconfig options. +To test RPU recovery, you must build the sample with :kconfig:option:`CONFIG_SHELL` and :kconfig:option:`CONFIG_NRF70_UTIL` Kconfig options. #. Trigger RPU recovery using the following command: diff --git a/samples/wifi/sta/prj.conf b/samples/wifi/sta/prj.conf index 665afd1c190c..4690076e44d0 100644 --- a/samples/wifi/sta/prj.conf +++ b/samples/wifi/sta/prj.conf @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y # WPA supplicant CONFIG_WPA_SUPP=y @@ -34,7 +34,7 @@ CONFIG_NET_PKT_TX_COUNT=8 CONFIG_NET_BUF_RX_COUNT=8 CONFIG_NET_BUF_TX_COUNT=16 CONFIG_NET_BUF_DATA_SIZE=128 -CONFIG_NRF700X_RX_NUM_BUFS=16 +CONFIG_NRF70_RX_NUM_BUFS=16 CONFIG_HEAP_MEM_POOL_SIZE=90000 CONFIG_NET_TC_TX_COUNT=1 diff --git a/samples/wifi/sta/src/main.c b/samples/wifi/sta/src/main.c index f5e2b709f564..bb2f586d6993 100644 --- a/samples/wifi/sta/src/main.c +++ b/samples/wifi/sta/src/main.c @@ -256,11 +256,11 @@ int start_app(void) { #if defined(CONFIG_BOARD_NRF7002DK_NRF7001_NRF5340_CPUAPP) || \ defined(CONFIG_BOARD_NRF7002DK_NRF5340_CPUAPP) - if (strlen(CONFIG_NRF700X_QSPI_ENCRYPTION_KEY)) { + if (strlen(CONFIG_NRF70_QSPI_ENCRYPTION_KEY)) { int ret; char key[QSPI_KEY_LEN_BYTES]; - ret = bytes_from_str(CONFIG_NRF700X_QSPI_ENCRYPTION_KEY, key, sizeof(key)); + ret = bytes_from_str(CONFIG_NRF70_QSPI_ENCRYPTION_KEY, key, sizeof(key)); if (ret) { LOG_ERR("Failed to parse encryption key: %d\n", ret); return 0; diff --git a/samples/wifi/sta/sysbuild.conf b/samples/wifi/sta/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/sta/sysbuild.conf +++ b/samples/wifi/sta/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/samples/wifi/thread_coex/prj.conf b/samples/wifi/thread_coex/prj.conf index fdd9946e574b..9247452fd7b8 100644 --- a/samples/wifi/thread_coex/prj.conf +++ b/samples/wifi/thread_coex/prj.conf @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y # WPA supplicant CONFIG_WPA_SUPP=y @@ -72,9 +72,9 @@ CONFIG_NET_CONFIG_MY_IPV4_GW="192.168.1.1" CONFIG_WIFI_ZPERF_PKT_SIZE=1024 CONFIG_WIFI_ZPERF_RATE=10000 -CONFIG_NRF700X_MAX_TX_PENDING_QLEN=12 +CONFIG_NRF70_MAX_TX_PENDING_QLEN=12 CONFIG_NRF_WIFI_LOW_POWER=y -CONFIG_NRF700X_QSPI_LOW_POWER=n +CONFIG_NRF70_QSPI_LOW_POWER=n CONFIG_LOG_BUFFER_SIZE=2048 CONFIG_NET_MGMT_EVENT_QUEUE_TIMEOUT=5000 diff --git a/samples/wifi/thread_coex/src/main.c b/samples/wifi/thread_coex/src/main.c index 358c068cd10a..5d470d218311 100644 --- a/samples/wifi/thread_coex/src/main.c +++ b/samples/wifi/thread_coex/src/main.c @@ -43,14 +43,14 @@ int main(void) return -1; } -#if !defined(CONFIG_COEX_SEP_ANTENNAS) && !(CONFIG_NRF700X_SR_COEX_RF_SWITCH) +#if !defined(CONFIG_COEX_SEP_ANTENNAS) && !(CONFIG_NRF70_SR_COEX_RF_SWITCH) BUILD_ASSERT("Shared antenna support is not available with nRF7002 shields"); #endif /* register callback functions */ wifi_init(); -#ifdef CONFIG_NRF700X_SR_COEX_RF_SWITCH +#ifdef CONFIG_NRF70_SR_COEX_RF_SWITCH /* Configure SR side (nRF5340 side) switch in nRF700x */ /* LOG_INF("Configure SR side switch"); */ ret = nrf_wifi_config_sr_switch(is_ant_mode_sep); @@ -58,9 +58,9 @@ int main(void) LOG_ERR("Unable to configure SR side switch: %d", ret); return ret; } -#endif /* CONFIG_NRF700X_SR_COEX_RF_SWITCH */ +#endif /* CONFIG_NRF70_SR_COEX_RF_SWITCH */ -#if defined(CONFIG_NRF700X_SR_COEX) +#if defined(CONFIG_NRF70_SR_COEX) /* Configure non-PTA registers of Coexistence Hardware */ /* LOG_INF("Configuring non-PTA registers."); */ ret = nrf_wifi_coex_config_non_pta(is_ant_mode_sep, is_sr_protocol_ble); @@ -68,7 +68,7 @@ int main(void) LOG_ERR("Configuring non-PTA registers of CoexHardware FAIL"); return ret; } -#endif /* CONFIG_NRF700X_SR_COEX */ +#endif /* CONFIG_NRF70_SR_COEX */ ret = wifi_tput_ot_tput(test_wifi, is_ant_mode_sep, test_thread, is_ot_client, is_wifi_server, is_wifi_zperf_udp, is_ot_zperf_udp, diff --git a/samples/wifi/thread_coex/src/ot_coex_functions.c b/samples/wifi/thread_coex/src/ot_coex_functions.c index 7826c88c0b3e..96a2b94e4041 100644 --- a/samples/wifi/thread_coex/src/ot_coex_functions.c +++ b/samples/wifi/thread_coex/src/ot_coex_functions.c @@ -701,9 +701,9 @@ int wifi_tput_ot_tput(bool test_wifi, bool is_ant_mode_sep, bool test_thread, bo LOG_ERR("further is not meaningful. So, exiting the test"); return ret; } -#if defined(CONFIG_NRF700X_SR_COEX) +#if defined(CONFIG_NRF70_SR_COEX) config_pta(is_ant_mode_sep, is_ot_client, is_wifi_server, is_sr_protocol_ble); -#endif/* CONFIG_NRF700X_SR_COEX */ +#endif/* CONFIG_NRF70_SR_COEX */ } if (test_thread) { LOG_INF("Thread operating channel = %d", CONFIG_OT_CHANNEL); diff --git a/samples/wifi/thread_coex/sysbuild.conf b/samples/wifi/thread_coex/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/thread_coex/sysbuild.conf +++ b/samples/wifi/thread_coex/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/samples/wifi/throughput/overlay-high-performance.conf b/samples/wifi/throughput/overlay-high-performance.conf index 76976d86ce87..918fae392509 100644 --- a/samples/wifi/throughput/overlay-high-performance.conf +++ b/samples/wifi/throughput/overlay-high-performance.conf @@ -1,5 +1,5 @@ -CONFIG_NRF700X_AP_MODE=n -CONFIG_NRF700X_P2P_MODE=n +CONFIG_NRF70_AP_MODE=n +CONFIG_NRF70_P2P_MODE=n CONFIG_NET_PKT_TX_COUNT=30 CONFIG_NET_PKT_RX_COUNT=30 CONFIG_NET_BUF_TX_COUNT=60 @@ -7,10 +7,10 @@ CONFIG_NET_BUF_RX_COUNT=30 CONFIG_NET_BUF_DATA_SIZE=1100 CONFIG_HEAP_MEM_POOL_SIZE=230000 CONFIG_SPEED_OPTIMIZATIONS=y -CONFIG_NRF700X_QSPI_LOW_POWER=n -CONFIG_NRF700X_UTIL=n -CONFIG_NRF700X_MAX_TX_AGGREGATION=9 -CONFIG_NRF700X_MAX_TX_TOKENS=12 +CONFIG_NRF70_QSPI_LOW_POWER=n +CONFIG_NRF70_UTIL=n +CONFIG_NRF70_MAX_TX_AGGREGATION=9 +CONFIG_NRF70_MAX_TX_TOKENS=12 CONFIG_POSIX_MAX_FDS=20 CONFIG_NET_SOCKETS_POLL_MAX=20 # Sockets: select + poll take up more stack diff --git a/samples/wifi/throughput/overlay-iot-devices.conf b/samples/wifi/throughput/overlay-iot-devices.conf index 01826244dca5..1c6ab2231723 100644 --- a/samples/wifi/throughput/overlay-iot-devices.conf +++ b/samples/wifi/throughput/overlay-iot-devices.conf @@ -1,17 +1,17 @@ -CONFIG_NRF700X_AP_MODE=n -CONFIG_NRF700X_P2P_MODE=n +CONFIG_NRF70_AP_MODE=n +CONFIG_NRF70_P2P_MODE=n CONFIG_NET_PKT_TX_COUNT=6 CONFIG_NET_PKT_RX_COUNT=6 CONFIG_NET_BUF_TX_COUNT=12 CONFIG_NET_BUF_RX_COUNT=6 -CONFIG_NRF700X_RX_NUM_BUFS=6 +CONFIG_NRF70_RX_NUM_BUFS=6 CONFIG_NET_BUF_DATA_SIZE=800 CONFIG_HEAP_MEM_POOL_SIZE=230000 CONFIG_SPEED_OPTIMIZATIONS=y -CONFIG_NRF700X_QSPI_LOW_POWER=n -CONFIG_NRF700X_UTIL=n -CONFIG_NRF700X_MAX_TX_AGGREGATION=1 -CONFIG_NRF700X_MAX_TX_TOKENS=5 +CONFIG_NRF70_QSPI_LOW_POWER=n +CONFIG_NRF70_UTIL=n +CONFIG_NRF70_MAX_TX_AGGREGATION=1 +CONFIG_NRF70_MAX_TX_TOKENS=5 CONFIG_POSIX_MAX_FDS=20 CONFIG_NET_SOCKETS_POLL_MAX=20 # Sockets: select + poll take up more stack diff --git a/samples/wifi/throughput/overlay-memory-optimized.conf b/samples/wifi/throughput/overlay-memory-optimized.conf index a9fef166df7d..e5fa6ca28bf9 100644 --- a/samples/wifi/throughput/overlay-memory-optimized.conf +++ b/samples/wifi/throughput/overlay-memory-optimized.conf @@ -1,17 +1,17 @@ -CONFIG_NRF700X_AP_MODE=n -CONFIG_NRF700X_P2P_MODE=n +CONFIG_NRF70_AP_MODE=n +CONFIG_NRF70_P2P_MODE=n CONFIG_NET_PKT_TX_COUNT=6 CONFIG_NET_PKT_RX_COUNT=6 CONFIG_NET_BUF_TX_COUNT=12 CONFIG_NET_BUF_RX_COUNT=6 -CONFIG_NRF700X_RX_NUM_BUFS=6 +CONFIG_NRF70_RX_NUM_BUFS=6 CONFIG_NET_BUF_DATA_SIZE=500 CONFIG_HEAP_MEM_POOL_SIZE=230000 CONFIG_SPEED_OPTIMIZATIONS=y -CONFIG_NRF700X_QSPI_LOW_POWER=n -CONFIG_NRF700X_UTIL=n -CONFIG_NRF700X_MAX_TX_AGGREGATION=1 -CONFIG_NRF700X_MAX_TX_TOKENS=5 +CONFIG_NRF70_QSPI_LOW_POWER=n +CONFIG_NRF70_UTIL=n +CONFIG_NRF70_MAX_TX_AGGREGATION=1 +CONFIG_NRF70_MAX_TX_TOKENS=5 CONFIG_POSIX_MAX_FDS=20 CONFIG_NET_SOCKETS_POLL_MAX=20 # Sockets: select + poll take up more stack diff --git a/samples/wifi/throughput/overlay-rx-prio.conf b/samples/wifi/throughput/overlay-rx-prio.conf index bbe8edd3576a..5184ba081339 100644 --- a/samples/wifi/throughput/overlay-rx-prio.conf +++ b/samples/wifi/throughput/overlay-rx-prio.conf @@ -1,17 +1,17 @@ -CONFIG_NRF700X_AP_MODE=n -CONFIG_NRF700X_P2P_MODE=n +CONFIG_NRF70_AP_MODE=n +CONFIG_NRF70_P2P_MODE=n CONFIG_NET_PKT_TX_COUNT=5 CONFIG_NET_PKT_RX_COUNT=64 CONFIG_NET_BUF_TX_COUNT=10 CONFIG_NET_BUF_RX_COUNT=64 -CONFIG_NRF700X_RX_NUM_BUFS=64 +CONFIG_NRF70_RX_NUM_BUFS=64 CONFIG_NET_BUF_DATA_SIZE=1100 CONFIG_HEAP_MEM_POOL_SIZE=230000 CONFIG_SPEED_OPTIMIZATIONS=y -CONFIG_NRF700X_QSPI_LOW_POWER=n -CONFIG_NRF700X_UTIL=n -CONFIG_NRF700X_MAX_TX_AGGREGATION=2 -CONFIG_NRF700X_MAX_TX_TOKENS=5 +CONFIG_NRF70_QSPI_LOW_POWER=n +CONFIG_NRF70_UTIL=n +CONFIG_NRF70_MAX_TX_AGGREGATION=2 +CONFIG_NRF70_MAX_TX_TOKENS=5 CONFIG_POSIX_MAX_FDS=20 CONFIG_NET_SOCKETS_POLL_MAX=20 # Sockets: select + poll take up more stack diff --git a/samples/wifi/throughput/overlay-tx-prio.conf b/samples/wifi/throughput/overlay-tx-prio.conf index bf46d78f624b..2c97254bc5ce 100644 --- a/samples/wifi/throughput/overlay-tx-prio.conf +++ b/samples/wifi/throughput/overlay-tx-prio.conf @@ -1,17 +1,17 @@ -CONFIG_NRF700X_AP_MODE=n -CONFIG_NRF700X_P2P_MODE=n +CONFIG_NRF70_AP_MODE=n +CONFIG_NRF70_P2P_MODE=n CONFIG_NET_PKT_TX_COUNT=32 CONFIG_NET_PKT_RX_COUNT=10 CONFIG_NET_BUF_TX_COUNT=64 CONFIG_NET_BUF_RX_COUNT=10 -CONFIG_NRF700X_RX_NUM_BUFS=10 +CONFIG_NRF70_RX_NUM_BUFS=10 CONFIG_NET_BUF_DATA_SIZE=1100 CONFIG_HEAP_MEM_POOL_SIZE=230000 CONFIG_SPEED_OPTIMIZATIONS=y -CONFIG_NRF700X_QSPI_LOW_POWER=n -CONFIG_NRF700X_UTIL=n -CONFIG_NRF700X_MAX_TX_AGGREGATION=9 -CONFIG_NRF700X_MAX_TX_TOKENS=12 +CONFIG_NRF70_QSPI_LOW_POWER=n +CONFIG_NRF70_UTIL=n +CONFIG_NRF70_MAX_TX_AGGREGATION=9 +CONFIG_NRF70_MAX_TX_TOKENS=12 CONFIG_POSIX_MAX_FDS=20 CONFIG_NET_SOCKETS_POLL_MAX=20 # Sockets: select + poll take up more stack diff --git a/samples/wifi/throughput/prj.conf b/samples/wifi/throughput/prj.conf index 3f8e9e3ce343..2f208645e376 100644 --- a/samples/wifi/throughput/prj.conf +++ b/samples/wifi/throughput/prj.conf @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y # WPA supplicant CONFIG_WPA_SUPP=y @@ -35,8 +35,8 @@ CONFIG_NET_PKT_TX_COUNT=8 CONFIG_NET_BUF_RX_COUNT=16 CONFIG_NET_BUF_TX_COUNT=16 CONFIG_NET_BUF_DATA_SIZE=128 -CONFIG_NRF700X_RX_NUM_BUFS=16 -CONFIG_NRF700X_MAX_TX_AGGREGATION=4 +CONFIG_NRF70_RX_NUM_BUFS=16 +CONFIG_NRF70_MAX_TX_AGGREGATION=4 # nRF700x is main consumer: (16 + 8) * 1600 = ~40KB + ~40KB control path (experimental) CONFIG_HEAP_MEM_POOL_SIZE=80000 CONFIG_NET_TC_TX_COUNT=1 diff --git a/samples/wifi/throughput/sysbuild.conf b/samples/wifi/throughput/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/throughput/sysbuild.conf +++ b/samples/wifi/throughput/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/samples/wifi/twt/prj.conf b/samples/wifi/twt/prj.conf index 1d9ff2c43526..159c8010d879 100644 --- a/samples/wifi/twt/prj.conf +++ b/samples/wifi/twt/prj.conf @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y # WPA supplicant CONFIG_WPA_SUPP=y @@ -33,8 +33,8 @@ CONFIG_NET_BUF_RX_COUNT=16 CONFIG_NET_BUF_DATA_SIZE=1500 CONFIG_HEAP_MEM_POOL_SIZE=180000 #CONFIG_SPEED_OPTIMIZATIONS=y -#CONFIG_NRF700X_MAX_TX_AGGREGATION=9 -#CONFIG_NRF700X_MAX_TX_TOKENS=12 +#CONFIG_NRF70_MAX_TX_AGGREGATION=9 +#CONFIG_NRF70_MAX_TX_TOKENS=12 CONFIG_NET_TC_TX_COUNT=1 # Below configs will increase tcp connection timeout diff --git a/samples/wifi/twt/sysbuild.conf b/samples/wifi/twt/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/twt/sysbuild.conf +++ b/samples/wifi/twt/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/samples/wifi/wfa_qt_app/prj.conf b/samples/wifi/wfa_qt_app/prj.conf index 51c958373076..8edc3280237c 100644 --- a/samples/wifi/wfa_qt_app/prj.conf +++ b/samples/wifi/wfa_qt_app/prj.conf @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # CONFIG_WIFI=y -CONFIG_WIFI_NRF700X=y +CONFIG_WIFI_NRF70=y CONFIG_WFA_QT_CONTROL_APP=y # Ideally this has to be done in the QT module, but we already override this in the # hostap module (7), so, hostap will override QT module's settings, so, we have to diff --git a/samples/wifi/wfa_qt_app/sysbuild.conf b/samples/wifi/wfa_qt_app/sysbuild.conf index 32948cdda47c..d9e7bee8f47b 100644 --- a/samples/wifi/wfa_qt_app/sysbuild.conf +++ b/samples/wifi/wfa_qt_app/sysbuild.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -SB_CONFIG_WIFI_NRF700X=y +SB_CONFIG_WIFI_NRF70=y diff --git a/snippets/nrf70-driver-debug/overlay-nrf70-driver-debug.conf b/snippets/nrf70-driver-debug/overlay-nrf70-driver-debug.conf index 51633ff7ef53..ae4a07865cc9 100644 --- a/snippets/nrf70-driver-debug/overlay-nrf70-driver-debug.conf +++ b/snippets/nrf70-driver-debug/overlay-nrf70-driver-debug.conf @@ -9,7 +9,7 @@ CONFIG_SHELL_STACK_SIZE=4600 CONFIG_NET_SHELL=y CONFIG_SHELL_GETOPT=y CONFIG_SHELL_CMDS_RESIZE=n -CONFIG_NRF700X_UTIL=y +CONFIG_NRF70_UTIL=y CONFIG_NET_L2_WIFI_SHELL=y CONFIG_NET_STATISTICS=y CONFIG_NET_STATISTICS_WIFI=y diff --git a/subsys/mpsl/cx/Kconfig b/subsys/mpsl/cx/Kconfig index da062a3352a1..6e4b157df42d 100644 --- a/subsys/mpsl/cx/Kconfig +++ b/subsys/mpsl/cx/Kconfig @@ -13,7 +13,7 @@ config MPSL_CX_ANY_SUPPORT help Indicates that the device tree contains a nrf_radio_coex node. -config MPSL_CX_NRF700X_SUPPORT +config MPSL_CX_NRF70_SUPPORT bool default $(dt_nodelabel_has_compat,nrf_radio_coex,$(DT_COMPAT_CX_NRF700X)) help @@ -57,7 +57,7 @@ choice MPSL_CX_CHOICE prompt "Radio Coexistence interface implementation" config MPSL_CX_NRF700X - depends on MPSL_CX_NRF700X_SUPPORT + depends on MPSL_CX_NRF70_SUPPORT select NRFX_GPIOTE if !MPSL_CX_PIN_FORWARDER select GPIO if !MPSL_CX_PIN_FORWARDER imply NRF_RPC if SOC_SERIES_NRF53X diff --git a/subsys/net/lib/softap_wifi_provision/Kconfig b/subsys/net/lib/softap_wifi_provision/Kconfig index a2e5fedded95..515d569818cb 100644 --- a/subsys/net/lib/softap_wifi_provision/Kconfig +++ b/subsys/net/lib/softap_wifi_provision/Kconfig @@ -8,7 +8,7 @@ menuconfig SOFTAP_WIFI_PROVISION bool "SoftAP Wi-Fi provision library [EXPERIMENTAL]" select EXPERIMENTAL depends on NANOPB - depends on NRF700X_AP_MODE + depends on NRF70_AP_MODE depends on WPA_SUPP_AP depends on SMF depends on NET_DHCPV4_SERVER diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt index 910df4253bdd..48db9417867f 100644 --- a/sysbuild/CMakeLists.txt +++ b/sysbuild/CMakeLists.txt @@ -421,8 +421,8 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) set_config_bool(${DEFAULT_IMAGE} CONFIG_BT_FAST_PAIR n) endif() - if(SB_CONFIG_WIFI_NRF700X) - set_config_bool(${DEFAULT_IMAGE} CONFIG_WIFI_NRF700X y) + if(SB_CONFIG_WIFI_NRF70) + set_config_bool(${DEFAULT_IMAGE} CONFIG_WIFI_NRF70 y) foreach(config WIFI_PATCHES_EXT_FLASH_DISABLED WIFI_PATCHES_EXT_FLASH_XIP WIFI_PATCHES_EXT_FLASH_STORE) @@ -444,7 +444,7 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake) set_config_bool(${DEFAULT_IMAGE} CONFIG_NRF_WIFI_FW_PATCH_DFU ${SB_CONFIG_DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH}) endif() else() - set_config_bool(${DEFAULT_IMAGE} CONFIG_WIFI_NRF700X n) + set_config_bool(${DEFAULT_IMAGE} CONFIG_WIFI_NRF70 n) endif() if(SB_CONFIG_ZEPHYR_CONNECTEDHOMEIP_MODULE) diff --git a/sysbuild/Kconfig.dfu b/sysbuild/Kconfig.dfu index 50e6c868ecd0..f66a612eccd9 100644 --- a/sysbuild/Kconfig.dfu +++ b/sysbuild/Kconfig.dfu @@ -33,7 +33,7 @@ config DFU_MULTI_IMAGE_PACKAGE_WIFI_FW_PATCH bool "nRF70 firmware patch" depends on PARTITION_MANAGER depends on BOOTLOADER_MCUBOOT - depends on WIFI_NRF700X + depends on WIFI_NRF70 depends on (WIFI_PATCHES_EXT_FLASH_XIP || WIFI_PATCHES_EXT_FLASH_STORE) help Enabling this option adds support for Device Firmware Update (DFU) for the nRF70 Series diff --git a/sysbuild/Kconfig.wifi b/sysbuild/Kconfig.wifi index 398033674bf6..937166fbed11 100644 --- a/sysbuild/Kconfig.wifi +++ b/sysbuild/Kconfig.wifi @@ -4,32 +4,32 @@ menu "Wi-Fi" -menuconfig WIFI_NRF700X +menuconfig WIFI_NRF70 bool "nRF700x" -if WIFI_NRF700X +if WIFI_NRF70 -choice WIFI_NRF700X_OPER_MODES +choice WIFI_NRF70_OPER_MODES bool "nRF700x operating mode" - default WIFI_NRF700X_SYSTEM_MODE + default WIFI_NRF70_SYSTEM_MODE help Select the operating mode of the nRF700x driver -config WIFI_NRF700X_SYSTEM_MODE - bool "Enable nRF700X system mode" +config WIFI_NRF70_SYSTEM_MODE + bool "Enable nRF70 system mode" help Select this option to enable system mode of the nRF700x driver -config WIFI_NRF700X_SCAN_ONLY - bool "Enable nRF700X scan only mode" +config WIFI_NRF70_SCAN_ONLY + bool "Enable nRF70 scan only mode" help Select this option to enable scan only mode of the nRF700x driver -config WIFI_NRF700X_RADIO_TEST +config WIFI_NRF70_RADIO_TEST bool "Radio test mode of the nRF700x driver" -config WIFI_NRF700X_SYSTEM_WITH_RAW_MODES - bool "Enable nRF700X system mode with raw modes" +config WIFI_NRF70_SYSTEM_WITH_RAW_MODES + bool "Enable nRF70 system mode with raw modes" help Select this option to enable system mode of the nRF700x driver with raw modes @@ -60,6 +60,6 @@ config WIFI_PATCHES_EXT_FLASH_STORE endchoice -endif # WIFI_NRF700X +endif # WIFI_NRF70 endmenu diff --git a/sysbuild/Kconfig.zip b/sysbuild/Kconfig.zip index 6dceed6e33a5..0d50fcfc1ab1 100644 --- a/sysbuild/Kconfig.zip +++ b/sysbuild/Kconfig.zip @@ -33,7 +33,7 @@ config DFU_ZIP_NET config DFU_ZIP_WIFI_FW_PATCH bool "nRF70 firmware patch" depends on PARTITION_MANAGER - depends on WIFI_NRF700X + depends on WIFI_NRF70 depends on (WIFI_PATCHES_EXT_FLASH_XIP || WIFI_PATCHES_EXT_FLASH_STORE) default y help diff --git a/tests/lib/location/location_lib_autoconf_ext.h b/tests/lib/location/location_lib_autoconf_ext.h index 83f7cbb8d29c..43cefac9c382 100644 --- a/tests/lib/location/location_lib_autoconf_ext.h +++ b/tests/lib/location/location_lib_autoconf_ext.h @@ -9,7 +9,7 @@ */ #define CONFIG_NRF_MODEM_LIB 1 -#define CONFIG_WIFI_NRF700X 1 +#define CONFIG_WIFI_NRF70 1 #define CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS 0 #define CONFIG_WIFI_MGMT_RAW_SCAN_RESULT_LENGTH 10 #define CONFIG_NET_MGMT_EVENT 1