tests: wifi: nrf_wifi: reduce config overrides

Reduce the number of config overrides needed for the various testcases
by only enabling the options if needed in the first place.

Signed-off-by: Jordan Yates <jordan@embeint.com>

Author: JordanYates

tests/drivers/wifi/nrf_wifi/Kconfig

@@ -0,0 +1,45 @@
+#
+# Copyright (c) 2025 Embeint Inc
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if !CONFIG_WIFI_USAGE_MODE_SCAN_ONLY
+
+configdefault WIFI_NM_WPA_SUPPLICANT
+	default y if NETWORKING
+configdefault WIFI_NM_WPA_SUPPLICANT_AP
+	default y
+
+configdefault NET_SOCKETS
+	default y
+configdefault NET_LOG
+	default y
+configdefault NET_IPV6
+	default y
+configdefault NET_IPV4
+	default y
+configdefault NET_UDP
+	default y
+configdefault NET_TCP
+	default y
+configdefault NET_DHCPV4
+	default y
+configdefault DNS_RESOLVER
+	default y
+
+configdefault NET_STATISTICS
+	default y
+configdefault NET_STATISTICS_WIFI
+	default y
+configdefault NET_STATISTICS_USER_API
+	default y
+
+configdefault NET_PKT_RX_COUNT
+	default 8
+configdefault NET_PKT_TX_COUNT
+	default 8
+
+endif # !CONFIG_WIFI_USAGE_MODE_SCAN_ONLY
+
+source "Kconfig.zephyr"

tests/drivers/wifi/nrf_wifi/prj.conf

@@ -5,27 +5,11 @@
 #
 CONFIG_WIFI=y
 CONFIG_WIFI_NRF70=y
-CONFIG_WIFI_NM_WPA_SUPPLICANT=y
 CONFIG_BUILD_ONLY_NO_BLOBS=y
 
 CONFIG_TEST_RANDOM_GENERATOR=y
 # Networking
 CONFIG_NETWORKING=y
-CONFIG_NET_SOCKETS=y
-CONFIG_NET_LOG=y
-CONFIG_NET_IPV6=y
-CONFIG_NET_IPV4=y
-CONFIG_NET_UDP=y
-CONFIG_NET_TCP=y
-CONFIG_NET_DHCPV4=y
-CONFIG_DNS_RESOLVER=y
-
-CONFIG_NET_STATISTICS=y
-CONFIG_NET_STATISTICS_WIFI=y
-CONFIG_NET_STATISTICS_USER_API=y
-
-CONFIG_NET_PKT_RX_COUNT=8
-CONFIG_NET_PKT_TX_COUNT=8
 
 # Below section is the primary contributor to SRAM and is currently
 # tuned for performance, but this will be revisited in the future.

tests/drivers/wifi/nrf_wifi/testcase.yaml

@@ -14,24 +14,13 @@ tests:
     extra_configs:
       - CONFIG_NRF70_RADIO_TEST=y
       - CONFIG_NETWORKING=n
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
   nrf70.build.scan_only:
     extra_configs:
-      - CONFIG_NRF70_SCAN_ONLY=y
-      - CONFIG_NETWORKING=y
-      - CONFIG_NET_DHCPV4=n
-      - CONFIG_NET_NATIVE=n
-      - CONFIG_NET_OFFLOAD=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
+      - CONFIG_WIFI_USAGE_MODE_SCAN_ONLY=y
   nrf70.build.raw_scan_results:
     extra_configs:
+      - CONFIG_WIFI_USAGE_MODE_SCAN_ONLY=y
       - CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS=y
-      - CONFIG_NRF70_SCAN_ONLY=y
-      - CONFIG_NETWORKING=y
-      - CONFIG_NET_DHCPV4=n
-      - CONFIG_NET_NATIVE=n
-      - CONFIG_NET_OFFLOAD=y
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
   nrf70.build.raw_tx:
     extra_configs:
       - CONFIG_NRF70_RAW_DATA_TX=y
@@ -45,11 +34,9 @@ tests:
     extra_configs:
       - CONFIG_NRF70_OFFLOADED_RAW_TX=y
       - CONFIG_NETWORKING=n
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT=n
-      - CONFIG_NET_L2_WIFI_MGMT=n
   nrf70.build.softap:
     extra_configs:
-      - CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y
+      - CONFIG_WIFI_USAGE_MODE_STA_AP=y
   nrf70.build.p2p:
     extra_configs:
       - CONFIG_NRF70_P2P_MODE=y