From c056a317647f39593e0112798c0d065bda1a9ced Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megi@xff.cz>
Date: Sat, 29 Jul 2023 22:31:41 +0200
Subject: [PATCH 406/464] bes2600: Move Kconfig options to makefile

Signed-of-by: Ondrej Jirman <megi@xff.cz>
---
 drivers/staging/bes2600/Kconfig  | 101 +++----------------------------
 drivers/staging/bes2600/Makefile |  35 +++++++----
 2 files changed, 32 insertions(+), 104 deletions(-)

diff --git a/drivers/staging/bes2600/Kconfig b/drivers/staging/bes2600/Kconfig
index 9c8de42ea6e0..3ff85fb473d3 100644
--- a/drivers/staging/bes2600/Kconfig
+++ b/drivers/staging/bes2600/Kconfig
@@ -1,93 +1,10 @@
 config BES2600
-	tristate "BES2600 WLAN support"
-	select MAC80211
-	select CFG80211
-	select NL80211_TESTMODE
-	default m
-
-if BES2600
-
-config BES2600_WLAN_SDIO
-	bool "SDIO bus interface support"
-	depends on MMC
-	default y
-
-
-config BES2600_WLAN_USB
-	bool "USB bus interface support"
-	depends on USB
-	default n
-
-
-config BES2600_WLAN_SPI
-	bool "SPI bus interface support"
-	depends on SPI
-	default n
-
-
-config BES2600_USE_GPIO_IRQ
-	bool "Use GPIO interrupt"
-	default n
-
-
-config BES2600_5GHZ_SUPPORT
-	bool "5GHz band support"
-	default y
-
-
-config BES2600_WAPI_SUPPORT
-	bool "WAPI support"
-	default y
-
-
-config BES2600_USE_STE_EXTENSIONS
-	bool "STE extensions"
-	default n
-
-
-config BES2600_DISABLE_BEACON_HINTS
-	bool "Disable 11d beacon hints"
-	default n
-
-config BES2600_TESTMODE
-	bool "bes2600 testmode support"
-	select NL80211_TESTMODE
-	default n
-
-menu "Driver debug features"
-
-config BES2600_DEBUGFS
-	bool "Expose driver internals to DebugFS (DEVELOPMENT)"
-	default y
-
-config BES2600_BH_DEBUG
-	bool "Enable low-level device communication logs (DEVELOPMENT)"
-
-config BES2600_WSM_DEBUG
-	bool "Enable WSM API debug messages (DEVELOPMENT)"
-
-config BES2600_WSM_DUMPS
-	bool "Verbose WSM API logging (DEVELOPMENT)"
-
-config BES2600_WSM_DUMPS_SHORT
-	bool "Dump only first x bytes (default 20) (DEVELOPMENT)"
-
-config BES2600_TXRX_DEBUG
-	bool "Enable TX/RX debug messages (DEVELOPMENT)"
-
-config BES2600_TX_POLICY_DEBUG
-	bool "Enable TX policy debug (DEVELOPMENT)"
-
-config BES2600_STA_DEBUG
-	bool "Enable STA/AP debug (DEVELOPMENT)"
-
-config BES2600_DUMP_ON_ERROR
-	bool "Dump kernel in case of critical error (DEVELOPMENT)"
-
-config BES2600_ITP
-	bool "Enable ITP DebugFS"
-
-
-endmenu
-
-endif # BES2600
+	tristate "Bestechnic BES2600 SDIO Wireless LAN NIC driver"
+	depends on WLAN && MMC && CFG80211
+	select CFG80211_WEXT
+	select CRYPTO
+	select CRYPTO_LIB_ARC4
+	select CONFIG_FW_LOADER
+	default n
+	help
+	This option enables support for BES2600 SDIO wifi.
diff --git a/drivers/staging/bes2600/Makefile b/drivers/staging/bes2600/Makefile
index 6b41436f6d4e..82622c1dda1b 100644
--- a/drivers/staging/bes2600/Makefile
+++ b/drivers/staging/bes2600/Makefile
@@ -1,3 +1,24 @@
+CONFIG_BES2600_WLAN_SDIO = y
+CONFIG_BES2600_WLAN_USB = n
+CONFIG_BES2600_WLAN_SPI = n
+CONFIG_BES2600_USE_GPIO_IRQ = n
+CONFIG_BES2600_5GHZ_SUPPORT = y
+CONFIG_BES2600_WAPI_SUPPORT = y
+CONFIG_BES2600_USE_STE_EXTENSIONS = n
+CONFIG_BES2600_DISABLE_BEACON_HINTS = n
+CONFIG_BES2600_TESTMODE = n
+CONFIG_BES2600_DEBUGFS = y
+CONFIG_BES2600_BH_DEBUG = n
+CONFIG_BES2600_WSM_DEBUG = n
+CONFIG_BES2600_WSM_DUMPS = n
+CONFIG_BES2600_WSM_DUMPS_SHORT = y
+CONFIG_BES2600_TXRX_DEBUG = n
+CONFIG_BES2600_TX_POLICY_DEBUG = n
+CONFIG_BES2600_STA_DEBUG = n
+CONFIG_BES2600_DUMP_ON_ERROR = n
+CONFIG_BES2600_ITP = n
+
+
 # feature option
 BES2600                                 ?= m
 
@@ -184,6 +205,8 @@ ccflags-y += $(call boolen_flag,PLAT_CVITEK_182X,y)
 
 ccflags-y += $(call boolen_flag,CONFIG_BES2600_VENDOR_CMD,y)
 
+ccflags-y += $(call boolen_flag,CONFIG_BES2600_USE_STE_EXTENSIONS,y)
+
 ccflags-y += $(call boolen_flag,CONFIG_BES2600_5GHZ_SUPPORT,y)
 ccflags-y += $(call boolen_flag,CONFIG_BES2600_STATIC_SDD,y)
 ccflags-y += $(call boolen_flag,P2P_MULTIVIF,y)
@@ -257,7 +280,6 @@ ccflags-y += -DDCW1260_DETECTION_LOGIC
 # sdd options
 ccflags-y += -DTEST_11B=0
 ccflags-y += -DDPD_CALI=0
-ccflags-y += -DDPD_CALI=0
 ccflags-y += -DALI_CONFG=0
 ccflags-y += -DCHIP_WIFI_ROM_VER=1
 ccflags-y += -DWIFI_OUT_FEM=0
@@ -316,14 +338,3 @@ bes2600-y += bes2600_factory.o
 endif
 
 obj-$(BES2600) += bes2600.o
-
-ifeq ($(KERNELRELEASE),)
-KVERSION = $(shell uname -r)
-all:
-	make -C /lib/modules/$(KVERSION)/build M=$(shell pwd) modules
-clean:
-	make -C /lib/modules/$(KVERSION)/build M=$(shell pwd) clean
-endif
-
-clean:
-	rm -rf *.o .*.o.d *.ko *.o.ur-safe .*.cmd *.mod *.mod.c .cache.mk modules.order Module.symvers .tmp_versions
-- 
2.34.1