瀏覽代碼

Kconfig style changes. select RFKILL by driver

Waldemar Brodkorb 10 年之前
父節點
當前提交
a7c4a1781c
共有 1 個文件被更改,包括 41 次插入71 次删除
  1. 41 71
      target/linux/config/Config.in.wireless

+ 41 - 71
target/linux/config/Config.in.wireless

@@ -1,24 +1,24 @@
 config ADK_KERNEL_WLAN
 config ADK_KERNEL_WLAN
-	boolean
+	bool
 
 
 config ADK_KERNEL_WIRELESS
 config ADK_KERNEL_WIRELESS
+	bool
 	select ADK_KERNEL_WLAN
 	select ADK_KERNEL_WLAN
-	boolean
 
 
 config ADK_KERNEL_WIRELESS_EXT
 config ADK_KERNEL_WIRELESS_EXT
-	boolean
+	bool
 
 
 config ADK_KERNEL_RFKILL
 config ADK_KERNEL_RFKILL
 	tristate
 	tristate
 	
 	
 config ADK_KERNEL_MAC80211_LEDS
 config ADK_KERNEL_MAC80211_LEDS
-	boolean
+	bool
 	select ADK_KERNEL_LEDS_CLASS
 	select ADK_KERNEL_LEDS_CLASS
 	select ADK_KERNEL_NEW_LEDS
 	select ADK_KERNEL_NEW_LEDS
 	select ADK_KERNEL_LEDS_TRIGGERS
 	select ADK_KERNEL_LEDS_TRIGGERS
 
 
 config ADK_KERNEL_WLAN_80211
 config ADK_KERNEL_WLAN_80211
-	boolean
+	bool
 
 
 config ADK_KERNEL_RT2X00
 config ADK_KERNEL_RT2X00
 	tristate
 	tristate
@@ -31,35 +31,35 @@ config ADK_KERNEL_RT2X00_LIB_PCI
 
 
 # vendor stuff
 # vendor stuff
 config ADK_KERNEL_NET_VENDOR_ATHEROS
 config ADK_KERNEL_NET_VENDOR_ATHEROS
-	boolean
+	bool
 
 
 config ADK_KERNEL_ATH_CARDS
 config ADK_KERNEL_ATH_CARDS
-	boolean
+	bool
 
 
 config ADK_KERNEL_RTL_CARDS
 config ADK_KERNEL_RTL_CARDS
-	boolean
+	bool
 
 
 config ADK_KERNEL_BCMA_POSSIBLE
 config ADK_KERNEL_BCMA_POSSIBLE
-	boolean
+	bool
 
 
 config ADK_KERNEL_RT2800USB_RT3573
 config ADK_KERNEL_RT2800USB_RT3573
-	boolean
+	bool
 
 
 config ADK_KERNEL_RT2800USB_RT53XX
 config ADK_KERNEL_RT2800USB_RT53XX
-	boolean
+	bool
 
 
 config ADK_KERNEL_RT2800USB_RT55XX
 config ADK_KERNEL_RT2800USB_RT55XX
-	boolean
+	bool
 
 
 config ADK_KERNEL_RT2800USB_UNKNOWN
 config ADK_KERNEL_RT2800USB_UNKNOWN
-	boolean
+	bool
 
 
 config ADK_KERNEL_LIB80211
 config ADK_KERNEL_LIB80211
-	select ADK_KERNEL_CRYPTO_MICHAEL_MIC
 	tristate
 	tristate
+	select ADK_KERNEL_CRYPTO_MICHAEL_MIC
 
 
 config ADK_KERNEL_CFG80211_WEXT
 config ADK_KERNEL_CFG80211_WEXT
-	boolean
+	bool
 
 
 config ADK_KERNEL_ATH_COMMON
 config ADK_KERNEL_ATH_COMMON
 	tristate
 	tristate
@@ -68,29 +68,28 @@ config ADK_KERNEL_P54_COMMON
 	tristate
 	tristate
 
 
 config ADK_KERNEL_MAC80211_DEBUG_MENU
 config ADK_KERNEL_MAC80211_DEBUG_MENU
-	boolean
+	bool
 
 
 config ADK_KERNEL_MAC80211_VERBOSE_DEBUG
 config ADK_KERNEL_MAC80211_VERBOSE_DEBUG
+	bool
 	select ADK_KERNEL_MAC80211_DEBUG_MENU
 	select ADK_KERNEL_MAC80211_DEBUG_MENU
-	boolean
 
 
 config ADK_KERNEL_MAC80211_DEBUGFS
 config ADK_KERNEL_MAC80211_DEBUGFS
-	boolean
+	bool
 
 
 config ADK_KERNEL_CFG80211
 config ADK_KERNEL_CFG80211
 	tristate
 	tristate
 	select ADK_KERNEL_WIRELESS
 	select ADK_KERNEL_WIRELESS
 	select ADK_KERNEL_WLAN_80211
 	select ADK_KERNEL_WLAN_80211
-	select ADK_KERNEL_RFKILL
 
 
 config ADK_KERNEL_MAC80211_RC_MINSTREL
 config ADK_KERNEL_MAC80211_RC_MINSTREL
-	boolean
+	bool
 
 
 config ADK_KERNEL_MAC80211_RC_MINSTREL_HT
 config ADK_KERNEL_MAC80211_RC_MINSTREL_HT
-	boolean
+	bool
 
 
 config ADK_KERNEL_CFG80211_WEXT
 config ADK_KERNEL_CFG80211_WEXT
-	boolean
+	bool
 
 
 config ADK_KERNEL_MAC80211
 config ADK_KERNEL_MAC80211
 	tristate
 	tristate
@@ -101,13 +100,12 @@ config ADK_KERNEL_MAC80211
 	select ADK_KERNEL_CRYPTO_AES
 	select ADK_KERNEL_CRYPTO_AES
 	select ADK_KERNEL_CRYPTO_ECB
 	select ADK_KERNEL_CRYPTO_ECB
 	select ADK_KERNEL_CRYPTO_ARC4
 	select ADK_KERNEL_CRYPTO_ARC4
-	select ADK_KERNEL_RFKILL
 	select ADK_KERNEL_MAC80211_RC_MINSTREL
 	select ADK_KERNEL_MAC80211_RC_MINSTREL
 	select ADK_KERNEL_MAC80211_RC_MINSTREL_HT
 	select ADK_KERNEL_MAC80211_RC_MINSTREL_HT
 	select ADK_KERNEL_CFG80211_WEXT
 	select ADK_KERNEL_CFG80211_WEXT
 
 
 config ADK_DEBUG_MAC80211
 config ADK_DEBUG_MAC80211
-	boolean
+	bool
 	select ADK_KERNEL_MAC80211_VERBOSE_DEBUG
 	select ADK_KERNEL_MAC80211_VERBOSE_DEBUG
 	select ADK_KERNEL_MAC80211_DEBUGFS
 	select ADK_KERNEL_MAC80211_DEBUGFS
 	select ADK_KERNEL_DEBUG_FS
 	select ADK_KERNEL_DEBUG_FS
@@ -116,16 +114,16 @@ menu "Wireless network card support"
 depends on ADK_TARGET_WITH_CARDBUS || ADK_TARGET_WITH_PCMCIA || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_AHB || ADK_TARGET_WITH_SDIO
 depends on ADK_TARGET_WITH_CARDBUS || ADK_TARGET_WITH_PCMCIA || ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_AHB || ADK_TARGET_WITH_SDIO
 
 
 config ADK_KERNEL_BRCMFMAC_SDIO
 config ADK_KERNEL_BRCMFMAC_SDIO
-	boolean
+	bool
 
 
 config ADK_KERNEL_BRCMFMAC
 config ADK_KERNEL_BRCMFMAC
-	prompt "Broadcom brcmfmac wireless driver"
+	tristate "Broadcom brcmfmac wireless driver"
-	tristate
 	select ADK_KERNEL_WIRELESS
 	select ADK_KERNEL_WIRELESS
 	select ADK_KERNEL_WLAN_80211
 	select ADK_KERNEL_WLAN_80211
 	select ADK_KERNEL_CFG80211
 	select ADK_KERNEL_CFG80211
 	select ADK_KERNEL_BCMA_POSSIBLE
 	select ADK_KERNEL_BCMA_POSSIBLE
 	select ADK_KERNEL_BRCMFMAC_SDIO
 	select ADK_KERNEL_BRCMFMAC_SDIO
+	select ADK_KERNEL_RFKILL
 	select ADK_PACKAGE_BRCMFMAC_FIRMWARE
 	select ADK_PACKAGE_BRCMFMAC_FIRMWARE
 	depends on ADK_TARGET_WITH_SDIO
 	depends on ADK_TARGET_WITH_SDIO
 	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
@@ -134,23 +132,20 @@ config ADK_KERNEL_BRCMFMAC
 	  Driver for Broadcom FullMac wireless cards
 	  Driver for Broadcom FullMac wireless cards
 
 
 config ADK_KERNEL_ATH6KL_SDIO
 config ADK_KERNEL_ATH6KL_SDIO
-	boolean
+	bool
 
 
 config ADK_KERNEL_ATH6KL
 config ADK_KERNEL_ATH6KL
-	prompt "Atheros 6kl wireless driver"
+	tristate "Atheros 6kl wireless driver"
-	tristate
 	select ADK_KERNEL_NET_VENDOR_ATHEROS
 	select ADK_KERNEL_NET_VENDOR_ATHEROS
 	select ADK_KERNEL_ATH_CARDS
 	select ADK_KERNEL_ATH_CARDS
 	select ADK_KERNEL_ATH6KL_SDIO
 	select ADK_KERNEL_ATH6KL_SDIO
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
 	depends on ADK_TARGET_WITH_SDIO
 	depends on ADK_TARGET_WITH_SDIO
-	default n
 	help
 	help
 	  Driver for Atheros wireless 6KL
 	  Driver for Atheros wireless 6KL
 
 
 config ADK_KERNEL_ATH5K
 config ADK_KERNEL_ATH5K
-	prompt "Atheros 5xxx wireless driver"
+	tristate "Atheros 5xxx wireless driver"
-	tristate
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KERNEL_ATH_CARDS
 	select ADK_KERNEL_ATH_CARDS
 	select ADK_KERNEL_ATH_COMMON
 	select ADK_KERNEL_ATH_COMMON
@@ -163,11 +158,9 @@ config ADK_KERNEL_ATH5K
 	  Driver for Atheros 5xxx/24xx cards
 	  Driver for Atheros 5xxx/24xx cards
 
 
 config ADK_KERNEL_ATH5K_DEBUG
 config ADK_KERNEL_ATH5K_DEBUG
-	prompt "enable debugging info via debugfs"
+	bool "enable debugging info via debugfs"
-	boolean
 	select ADK_DEBUG_MAC80211
 	select ADK_DEBUG_MAC80211
 	depends on ADK_KERNEL_ATH5K
 	depends on ADK_KERNEL_ATH5K
-	default n
 	help
 	help
    	  Atheros 5xxx debugging messages.
    	  Atheros 5xxx debugging messages.
 	  Say Y, if and you will get debug options for ath5k.
 	  Say Y, if and you will get debug options for ath5k.
@@ -181,39 +174,32 @@ config ADK_KERNEL_ATH5K_DEBUG
 	   insmod ath5k.ko debug=0x00000400
 	   insmod ath5k.ko debug=0x00000400
 
 
 config ADK_KERNEL_B43
 config ADK_KERNEL_B43
-	prompt "Broadcom B43xx wireless driver"
+	tristate "Broadcom B43xx wireless driver"
-	tristate
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
 	select ADK_PACKAGE_B43_FIRMWARE
 	select ADK_PACKAGE_B43_FIRMWARE
 	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
 	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
-	default n
 	help
 	help
 	  Driver for Broadcom B43xx wireless chips
 	  Driver for Broadcom B43xx wireless chips
 
 
 config ADK_KERNEL_B43LEGACY
 config ADK_KERNEL_B43LEGACY
-	prompt "Broadcom B43xx (legacy) wireless driver" 
+	tristate "Broadcom B43xx (legacy) wireless driver" 
-	tristate
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
 	select ADK_PACKAGE_B43_FIRMWARE
 	select ADK_PACKAGE_B43_FIRMWARE
 	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
 	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
-	default n
 	help
 	help
 	  Driver for Broadcom B43xx wireless chips
 	  Driver for Broadcom B43xx wireless chips
 
 
 config ADK_KERNEL_HOSTAP
 config ADK_KERNEL_HOSTAP
-	prompt "HostAP driver"
+	tristate "HostAP driver"
-	tristate
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
-	default n
 	depends on ADK_TARGET_WITH_PCMCIA
 	depends on ADK_TARGET_WITH_PCMCIA
 	help
 	help
 	  HostAP Driver for wireless chips
 	  HostAP Driver for wireless chips
 
 
 config ADK_KERNEL_HOSTAP_CS
 config ADK_KERNEL_HOSTAP_CS
-	prompt "HostAP driver for PC Cards"
+	tristate "HostAP driver for PC Cards"
-	tristate
 	select ADK_KERNEL_HOSTAP
 	select ADK_KERNEL_HOSTAP
 	depends on ADK_TARGET_WITH_PCMCIA
 	depends on ADK_TARGET_WITH_PCMCIA
 	default m if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default m if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -222,18 +208,15 @@ config ADK_KERNEL_HOSTAP_CS
 	  HostAP CS Driver for wireless chips
 	  HostAP CS Driver for wireless chips
 
 
 config ADK_KERNEL_RTL8187
 config ADK_KERNEL_RTL8187
-	prompt "Realtek RTL8187/RTL8187B wireless driver"
+	tristate "Realtek RTL8187/RTL8187B wireless driver"
-	tristate
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_EEPROM_93CX6
 	select ADK_KERNEL_EEPROM_93CX6
 	depends on ADK_TARGET_WITH_USB
 	depends on ADK_TARGET_WITH_USB
-	default n
 	help
 	help
 	  Driver for Realtek RTL8187/RTL8187B wireless chips
 	  Driver for Realtek RTL8187/RTL8187B wireless chips
 
 
 config ADK_KERNEL_P54_USB
 config ADK_KERNEL_P54_USB
-	prompt "Prism54 USB support"
+	tristate "Prism54 USB support"
-	tristate
 	select ADK_KERNEL_EXPERIMENTAL
 	select ADK_KERNEL_EXPERIMENTAL
 	select ADK_KERNEL_P54_COMMON
 	select ADK_KERNEL_P54_COMMON
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_FW_LOADER
@@ -241,13 +224,11 @@ config ADK_KERNEL_P54_USB
 	select ADK_KERNEL_CRC_CCITT
 	select ADK_KERNEL_CRC_CCITT
 	select ADK_PACKAGE_P54_FIRMWARE
 	select ADK_PACKAGE_P54_FIRMWARE
 	depends on ADK_TARGET_WITH_USB
 	depends on ADK_TARGET_WITH_USB
-	default n
 	help
 	help
 	  Driver for Prism54 USB adaptors
 	  Driver for Prism54 USB adaptors
 
 
 config ADK_KERNEL_RT2800USB
 config ADK_KERNEL_RT2800USB
-	prompt "Ralink rt2800 USB driver"
+	tristate "Ralink rt2800 USB driver"
-	tristate
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_RT2800USB_RT3573
 	select ADK_KERNEL_RT2800USB_RT3573
 	select ADK_KERNEL_RT2800USB_RT53XX
 	select ADK_KERNEL_RT2800USB_RT53XX
@@ -257,51 +238,43 @@ config ADK_KERNEL_RT2800USB
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_CRC_CCITT
 	select ADK_KERNEL_CRC_CCITT
 	depends on ADK_TARGET_WITH_USB
 	depends on ADK_TARGET_WITH_USB
-	default n
 	help
 	help
 	  Driver for Ralink RT2800 USB
 	  Driver for Ralink RT2800 USB
 
 
 config ADK_KERNEL_RTL8192CU
 config ADK_KERNEL_RTL8192CU
-	prompt "Realtek RTL8192CU USB driver"
+	tristate "Realtek RTL8192CU USB driver"
-	tristate
 	select ADK_KERNEL_RTL_CARDS
 	select ADK_KERNEL_RTL_CARDS
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_FW_LOADER
 	select ADK_KERNEL_FW_LOADER
 	select ADK_PACKAGE_REALTEK_FIRMWARE
 	select ADK_PACKAGE_REALTEK_FIRMWARE
 	depends on ADK_TARGET_WITH_USB
 	depends on ADK_TARGET_WITH_USB
-	default n
 	help
 	help
 	  Driver for Realtek RTL8192CU USB
 	  Driver for Realtek RTL8192CU USB
 
 
 config ADK_KERNEL_RT2400PCI
 config ADK_KERNEL_RT2400PCI
-	prompt "Ralink rt2400 PCI driver"
+	tristate "Ralink rt2400 PCI driver"
-	tristate
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_RT2X00_LIB_PCI
 	select ADK_KERNEL_RT2X00_LIB_PCI
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KERNEL_MAC80211_LEDS
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
-	default n
 	help
 	help
 	  This adds support for rt2400 wireless chipset family.
 	  This adds support for rt2400 wireless chipset family.
 	  Supported chips: RT2460.
 	  Supported chips: RT2460.
 
 
 config ADK_KERNEL_RT2500PCI
 config ADK_KERNEL_RT2500PCI
-	prompt "Ralink rt2500 PCI driver"
+	tristate "Ralink rt2500 PCI driver"
-	tristate
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_RT2X00_LIB_PCI
 	select ADK_KERNEL_RT2X00_LIB_PCI
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KERNEL_MAC80211_LEDS
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
-	default n
 	help
 	help
 	  This adds support for rt2500 wireless chipset family.
 	  This adds support for rt2500 wireless chipset family.
 	  Supported chips: RT2560.
 	  Supported chips: RT2560.
 
 
 config ADK_KERNEL_RT61PCI
 config ADK_KERNEL_RT61PCI
-	prompt "Ralink rt2501/rt61 PCI driver"
+	tristate "Ralink rt2501/rt61 PCI driver"
-	tristate
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_RT2X00_LIB_PCI
 	select ADK_KERNEL_RT2X00_LIB_PCI
 	select ADK_KERNEL_MAC80211
 	select ADK_KERNEL_MAC80211
@@ -309,19 +282,16 @@ config ADK_KERNEL_RT61PCI
 	select ADK_KERNEL_CRC_ITU_T
 	select ADK_KERNEL_CRC_ITU_T
 	select ADK_PACKAGE_RT61_FIRMWARE
 	select ADK_PACKAGE_RT61_FIRMWARE
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
-	default n
 	help
 	help
 	  This adds support for rt2501 wireless chipset family.
 	  This adds support for rt2501 wireless chipset family.
 	  Supported chips: RT2561, RT2561S & RT2661.
 	  Supported chips: RT2561, RT2561S & RT2661.
 
 
 config ADK_KERNEL_RT2X00_DEBUG
 config ADK_KERNEL_RT2X00_DEBUG
-	prompt "enable debugging info"
+	bool "enable debugging info"
-	boolean
 	select ADK_DEBUG_MAC80211
 	select ADK_DEBUG_MAC80211
 	depends on ADK_KERNEL_RT61PCI || \
 	depends on ADK_KERNEL_RT61PCI || \
 		ADK_KERNEL_RT2500PCI || \
 		ADK_KERNEL_RT2500PCI || \
 		ADK_KERNEL_RT2400PCI	
 		ADK_KERNEL_RT2400PCI	
-	default n
 	help
 	help
 
 
 endmenu
 endmenu