samples: cellular: location: Enable Wi-Fi by default for Thingy91x

Initially location sample had Wi-Fi disabled by default for Thingy91x.
Reverting that decision and aligning with some other apps/samples.

Jira: NCSDK-30108

Signed-off-by: Tommi Rantanen <[email protected]>

Author: trantanen

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

@@ -247,7 +247,13 @@ Bluetooth Mesh samples
 Cellular samples
 ----------------
 
-|no_changes_yet_note|
+* :ref:`location_sample` sample:
+
+  * Updated:
+
+    * The Thingy:91 X build to support Wi-Fi by default without overlays.
+
+
 Cryptography samples
 --------------------
 

samples/cellular/location/Kconfig.sysbuild

@@ -0,0 +1,14 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+config WIFI_NRF70
+	default y if BOARD_THINGY91X_NRF9151_NS
+
+choice WIFI_NRF70_OPER_MODES
+	default WIFI_NRF70_SCAN_ONLY if BOARD_THINGY91X_NRF9151_NS
+endchoice
+
+source "${ZEPHYR_BASE}/share/sysbuild/Kconfig"

samples/cellular/location/README.rst

@@ -54,7 +54,6 @@ The configuration files are in the |sample path| directory.
 The following files are available:
 
 * :file:`overlay-nrf700x-wifi-scan-only.conf` - Config overlay for nRF7002 Wi-Fi chip support.
-* :file:`thingy91x-wifi.overlay` - DTC overlay for Thingy:91 X Wi-Fi support.
 * :file:`overlay-pgps.conf` - Config overlay for P-GPS support.
 
 .. include:: /libraries/modem/nrf_modem_lib/nrf_modem_lib_trace.rst
@@ -83,17 +82,9 @@ For example:
 
 See :ref:`cmake_options` for more instructions on how to add these options.
 
-Thingy:91 X Wi-Fi support
-=========================
-
-To build the Location 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_NRF70=y -DSB_CONFIG_WIFI_NRF70_SCAN_ONLY=y
-
-See :ref:`cmake_options` for more instructions on how to add these options.
+.. note::
+   The Thingy:91 X build supports Wi-Fi by default.
+	You do not need to add any overlays.
 
 P-GPS support
 =============

samples/cellular/location/boards/thingy91x_nrf9151_ns.conf

@@ -0,0 +1,66 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# Configuration file for Thingy:91 X mainly enabling Wi-Fi.
+# This file is merged with prj.conf in the application folder, and options
+# set here will take precedence if they are present in both files.
+
+CONFIG_LOCATION_METHOD_WIFI=y
+CONFIG_LOCATION_SERVICE_NRF_CLOUD=y
+
+# Align this with CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT.
+# Also see comments for CONFIG_HEAP_MEM_POOL_SIZE.
+CONFIG_LOCATION_METHOD_WIFI_SCANNING_RESULTS_MAX_CNT=60
+CONFIG_LOCATION_WORKQUEUE_STACK_SIZE=8192
+
+# Actual configs for the Wi-Fi
+CONFIG_WIFI=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
+
+# System settings
+CONFIG_NEWLIB_LIBC=y
+
+# Scan only using offload API
+CONFIG_WIFI_NM_WPA_SUPPLICANT=n
+
+# For nRF9160 the default is socket interface
+CONFIG_NET_DEFAULT_IF_ETHERNET=y
+CONFIG_MBEDTLS=n
+CONFIG_NORDIC_SECURITY_BACKEND=n
+
+# Networking
+CONFIG_NET_L2_ETHERNET=y
+CONFIG_NET_NATIVE=y
+CONFIG_NET_IPV4=y
+CONFIG_NET_DHCPV4=y
+CONFIG_NET_STATISTICS=y
+CONFIG_NET_STATISTICS_WIFI=y
+CONFIG_NET_STATISTICS_USER_API=y
+CONFIG_NET_CONTEXT_SYNC_RECV=y
+
+# Disable unused networking options
+CONFIG_NET_IPV6=n
+
+# Memory configurations
+CONFIG_NET_BUF_RX_COUNT=8
+CONFIG_NET_BUF_TX_COUNT=8
+CONFIG_NET_PKT_RX_COUNT=1
+CONFIG_NET_PKT_TX_COUNT=1
+CONFIG_NET_TX_STACK_SIZE=4096
+CONFIG_NET_RX_STACK_SIZE=4096
+CONFIG_NET_TC_TX_COUNT=1
+CONFIG_NET_MAX_CONTEXTS=5
+CONFIG_NET_MGMT_EVENT_STACK_SIZE=2048
+
+# Wi-Fi shell sample has 25000 heap size. We need a bit more for location request purposes.
+# Heap allocation should be changed when CONFIG_LOCATION_METHOD_WIFI_SCANNING_RESULTS_MAX_CNT
+# and CONFIG_NRF_WIFI_SCAN_MAX_BSS_CNT (which should be the same value) are changed.
+CONFIG_HEAP_MEM_POOL_SIZE=40000
+CONFIG_HEAP_MEM_POOL_IGNORE_MIN=y

samples/cellular/location/thingy91x_wifi.overlay renamed to samples/cellular/location/boards/thingy91x_nrf9151_ns.overlay

@@ -59,17 +59,6 @@ tests:
                 CONFIG_WIFI_NM_WPA_SUPPLICANT=n 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
-    build_only: true
-    integration_platforms:
-      - thingy91x/nrf9151/ns
-    platform_allow:
-      - thingy91x/nrf9151/ns
-    extra_args: EXTRA_CONF_FILE=overlay-nrf700x-wifi-scan-only.conf
-                EXTRA_DTC_OVERLAY_FILE=thingy91x_wifi.overlay
-                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
   sample.cellular.location.integration_config_positioning: