From 4ffa27568d501a4d31611208774fa0a9beabc4d7 Mon Sep 17 00:00:00 2001 From: Fengming Ye Date: Fri, 29 Nov 2024 11:26:27 +0900 Subject: [PATCH] wifi: nxp: kconfig: decouple dependency of soft AP Decouple dependency of CONFIG_NXP_WIFI_SOFTAP_SUPPORT. Add wifi defconfig to set default kconfig options when soft AP enabled. Signed-off-by: Fengming Ye --- drivers/wifi/nxp/Kconfig.nxp | 3 +++ samples/net/wifi/shell/boards/frdm_rw612.conf | 2 -- .../wifi/shell/boards/overlay_hostap_rw612.conf | 3 --- samples/net/wifi/shell/boards/rd_rw612_bga.conf | 2 -- soc/nxp/rw/Kconfig.defconfig | 4 ++++ soc/nxp/rw/Kconfig.defconfig.wifi | 17 +++++++++++++++++ 6 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 soc/nxp/rw/Kconfig.defconfig.wifi diff --git a/drivers/wifi/nxp/Kconfig.nxp b/drivers/wifi/nxp/Kconfig.nxp index 174f368d8e2..01052cf3059 100644 --- a/drivers/wifi/nxp/Kconfig.nxp +++ b/drivers/wifi/nxp/Kconfig.nxp @@ -539,6 +539,8 @@ config NXP_WIFI_SOFTAP_SUPPORT bool "Wi-Fi SoftAP Support" select NET_DHCPV4_SERVER select WIFI_NM_HOSTAPD_AP if WIFI_NM_WPA_SUPPLICANT + imply WIFI_NM_HOSTAPD_WPS if WIFI_NM_HOSTAPD_AP && WIFI_NM_WPA_SUPPLICANT_WPS + imply WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE if WIFI_NM_HOSTAPD_AP && WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE default y help Option to enable Wi-Fi SoftAP functions in the Wi-Fi driver. @@ -720,6 +722,7 @@ config NXP_WIFI_RESET config NXP_WIFI_ECSA bool "ECSA" default y + depends on NXP_WIFI_SOFTAP_SUPPORT help This option is used to do channel switch according to spec. diff --git a/samples/net/wifi/shell/boards/frdm_rw612.conf b/samples/net/wifi/shell/boards/frdm_rw612.conf index f7f342a8d93..7ea696cf074 100644 --- a/samples/net/wifi/shell/boards/frdm_rw612.conf +++ b/samples/net/wifi/shell/boards/frdm_rw612.conf @@ -31,7 +31,6 @@ CONFIG_SHELL_CMD_BUFF_SIZE=512 # net CONFIG_NET_L2_ETHERNET=y -CONFIG_NET_DHCPV4_SERVER_ADDR_COUNT=32 CONFIG_NET_IPV4=y CONFIG_NET_IPV6=y CONFIG_ETH_MCUX=n @@ -63,7 +62,6 @@ CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT=3 CONFIG_NET_IPV6_FRAGMENT_MAX_PKT=8 CONFIG_NET_IPV6_FRAGMENT_TIMEOUT=3 CONFIG_NET_MAX_CONN=10 -CONFIG_NET_DHCPV4_SERVER_ICMP_PROBE_TIMEOUT=100 CONFIG_ETH_DRIVER=n # net threads priority diff --git a/samples/net/wifi/shell/boards/overlay_hostap_rw612.conf b/samples/net/wifi/shell/boards/overlay_hostap_rw612.conf index 1d6b298768d..694ccc13534 100644 --- a/samples/net/wifi/shell/boards/overlay_hostap_rw612.conf +++ b/samples/net/wifi/shell/boards/overlay_hostap_rw612.conf @@ -9,10 +9,7 @@ CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA=y CONFIG_WIFI_NM_WPA_SUPPLICANT_INF_MON=n CONFIG_WIFI_NM_MAX_MANAGED_INTERFACES=2 CONFIG_SAE_PWE_EARLY_EXIT=y -CONFIG_WIFI_NM_HOSTAPD_AP=y CONFIG_WIFI_NM_WPA_SUPPLICANT_WPS=y -CONFIG_WIFI_NM_HOSTAPD_WPS=y -CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE=y # Enable mbedtls CONFIG_MBEDTLS=y diff --git a/samples/net/wifi/shell/boards/rd_rw612_bga.conf b/samples/net/wifi/shell/boards/rd_rw612_bga.conf index e81c4c2eefd..9681eceb3ed 100644 --- a/samples/net/wifi/shell/boards/rd_rw612_bga.conf +++ b/samples/net/wifi/shell/boards/rd_rw612_bga.conf @@ -31,7 +31,6 @@ CONFIG_SHELL_CMD_BUFF_SIZE=512 # net CONFIG_NET_L2_ETHERNET=y -CONFIG_NET_DHCPV4_SERVER_ADDR_COUNT=32 CONFIG_NET_IPV4=y CONFIG_NET_IPV6=y CONFIG_ETH_MCUX=n @@ -63,7 +62,6 @@ CONFIG_NET_IPV6_FRAGMENT_MAX_COUNT=3 CONFIG_NET_IPV6_FRAGMENT_MAX_PKT=8 CONFIG_NET_IPV6_FRAGMENT_TIMEOUT=3 CONFIG_NET_MAX_CONN=10 -CONFIG_NET_DHCPV4_SERVER_ICMP_PROBE_TIMEOUT=100 # net threads priority CONFIG_NET_TC_THREAD_PRIO_CUSTOM=y diff --git a/soc/nxp/rw/Kconfig.defconfig b/soc/nxp/rw/Kconfig.defconfig index a62d071345c..d627e990647 100644 --- a/soc/nxp/rw/Kconfig.defconfig +++ b/soc/nxp/rw/Kconfig.defconfig @@ -52,4 +52,8 @@ config NXP_FW_LOADER config NXP_RF_IMU default y if (BT || WIFI || IEEE802154) +if WIFI +orsource "Kconfig.defconfig.wifi" +endif # WIFI + endif # SOC_SERIES_RW6XX diff --git a/soc/nxp/rw/Kconfig.defconfig.wifi b/soc/nxp/rw/Kconfig.defconfig.wifi new file mode 100644 index 00000000000..7d4d4453137 --- /dev/null +++ b/soc/nxp/rw/Kconfig.defconfig.wifi @@ -0,0 +1,17 @@ +# Copyright 2022-2025 NXP +# SPDX-License-Identifier: Apache-2.0 + +if NETWORKING +if NET_DHCPV4_SERVER +config NET_DHCPV4_SERVER_ADDR_COUNT + default 32 + +config NET_DHCPV4_SERVER_ICMP_PROBE_TIMEOUT + default 100 +endif # NET_DHCPV4_SERVER + +if NET_L2_WIFI_MGMT +config WIFI_MGMT_AP_MAX_NUM_STA + default 8 if NXP_WIFI_SOFTAP_SUPPORT +endif # NET_L2_WIFI_MGMT +endif # NETWORKING