xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ti: unify Kconfig with other vendors

Browse Source 
Rename WL_TI to WLAN_VENDOR_TI to match with other vendor configs and make sure
that it's enabled by default in new configs. Convert menuconfigs to regular
configs to unify the wireless drivers menuconfig. Part of reorganising wireless
drivers directory and Kconfig.

Also remove WLCORE dependency to WL_TI. It should not be needed as WLCORE is
already under if  WLAN_VENDOR_TI.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Kalle Valo
2015-11-18 10:27:43 +02:00
parent 7b09ed5a09
commit bd842171a8
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/Kconfig
View File

@@ -29,6 +29,7 @@ source "drivers/net/wireless/ralink/Kconfig"
source "drivers/net/wireless/realtek/Kconfig" source "drivers/net/wireless/realtek/Kconfig"
source "drivers/net/wireless/rsi/Kconfig" source "drivers/net/wireless/rsi/Kconfig"
source "drivers/net/wireless/st/Kconfig" source "drivers/net/wireless/st/Kconfig"
source "drivers/net/wireless/ti/Kconfig"
source "drivers/net/wireless/zydas/Kconfig" source "drivers/net/wireless/zydas/Kconfig"
config PCMCIA_RAYCS config PCMCIA_RAYCS
@@ -99,6 +100,5 @@ config MAC80211_HWSIM
called mac80211_hwsim. If unsure, say N. called mac80211_hwsim. If unsure, say N.
source "drivers/net/wireless/ath/Kconfig" source "drivers/net/wireless/ath/Kconfig"
source "drivers/net/wireless/ti/Kconfig"
endif # WLAN endif # WLAN

3
drivers/net/wireless/Makefile
View File

@@ -14,6 +14,7 @@ obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/
obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/ obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/ obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
obj-$(CONFIG_WLAN_VENDOR_ST) += st/ obj-$(CONFIG_WLAN_VENDOR_ST) += st/
obj-$(CONFIG_WLAN_VENDOR_TI) += ti/
obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/ obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
# 16-bit wireless PCMCIA client drivers # 16-bit wireless PCMCIA client drivers
@@ -25,5 +26,3 @@ obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o
obj-$(CONFIG_ATH_CARDS) += ath/ obj-$(CONFIG_ATH_CARDS) += ath/
obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o
obj-$(CONFIG_WL_TI) += ti/

18
drivers/net/wireless/ti/Kconfig
View File

@@ -1,11 +1,15 @@
menuconfig WL_TI config WLAN_VENDOR_TI
bool "TI Wireless LAN support" bool "Texas Instrument devices"
default y
---help--- ---help---
This section contains support for all the wireless drivers If you have a wireless card belonging to this class, say Y.
for Texas Instruments WLAN chips, such as wl1251 and the wl12xx
family.
if WL_TI Note that the answer to this question doesn't directly affect the
kernel: saying N will just cause the configurator to skip all
the questions about cards. If you say Y, you will be asked for
your specific card in the following questions.
if WLAN_VENDOR_TI
source "drivers/net/wireless/ti/wl1251/Kconfig" source "drivers/net/wireless/ti/wl1251/Kconfig"
source "drivers/net/wireless/ti/wl12xx/Kconfig" source "drivers/net/wireless/ti/wl12xx/Kconfig"
source "drivers/net/wireless/ti/wl18xx/Kconfig" source "drivers/net/wireless/ti/wl18xx/Kconfig"
@@ -21,4 +25,4 @@ config WILINK_PLATFORM_DATA
Small platform data bit needed to pass data to the sdio modules. Small platform data bit needed to pass data to the sdio modules.
endif # WL_TI endif # WLAN_VENDOR_TI

2
drivers/net/wireless/ti/wl1251/Kconfig
View File

@@ -1,4 +1,4 @@
menuconfig WL1251 config WL1251
tristate "TI wl1251 driver support" tristate "TI wl1251 driver support"
depends on MAC80211 depends on MAC80211
select FW_LOADER select FW_LOADER

2
drivers/net/wireless/ti/wlcore/Kconfig
View File

@@ -1,6 +1,6 @@
config WLCORE config WLCORE
tristate "TI wlcore support" tristate "TI wlcore support"
depends on WL_TI && MAC80211 depends on MAC80211
select FW_LOADER select FW_LOADER
---help--- ---help---
This module contains the main code for TI WLAN chips. It abstracts This module contains the main code for TI WLAN chips. It abstracts