Skip to contentSkip to conversation

libertas: separate libertas' Kconfig in it's own file

PATCH In review Holger Schurig 3 participants 3 messages Oct 6, 2009 – Oct 7, 2009 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libertas: separate libertas' Kconfig in it's own file

Also sorts all "source" lines in the wireless/Kconfig.

drivers/net/wireless/Kconfig +8 -48
Index: linux-wl/drivers/net/wireless/Kconfig
===================================================================
@@ -139,47 +139,6 @@ config PCMCIA_RAYCS
 	  To compile this driver as a module, choose M here: the module will be
 	  called ray_cs.  If unsure, say N.
 
-config LIBERTAS
-	tristate "Marvell 8xxx Libertas WLAN driver support"
-	depends on WLAN_80211
-	select WIRELESS_EXT
-	select WEXT_SPY
-	select LIB80211
-	select FW_LOADER
-	---help---
-	  A library for Marvell Libertas 8xxx devices.
-
-config LIBERTAS_USB
-	tristate "Marvell Libertas 8388 USB 802.11b/g cards"
-	depends on LIBERTAS && USB
-	---help---
-	  A driver for Marvell Libertas 8388 USB devices.
-
-config LIBERTAS_CS
-	tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
-	depends on LIBERTAS && PCMCIA
-	select FW_LOADER
-	---help---
-	  A driver for Marvell Libertas 8385 CompactFlash devices.
-
-config LIBERTAS_SDIO
-	tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
-	depends on LIBERTAS && MMC
-	---help---
-	  A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
-
-config LIBERTAS_SPI
-	tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
-	depends on LIBERTAS && SPI
-	---help---
-	  A driver for Marvell Libertas 8686 SPI devices.
-
-config LIBERTAS_DEBUG
-	bool "Enable full debugging output in the Libertas module."
-	depends on LIBERTAS
-	---help---
-	  Debugging support.
-
 config LIBERTAS_THINFIRM
 	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
 	depends on WLAN_80211 && MAC80211
@@ -491,17 +450,18 @@ config MWL8K
 	  To compile this driver as a module, choose M here: the module
 	  will be called mwl8k.  If unsure, say N.
 
-source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/ipw2x00/Kconfig"
-source "drivers/net/wireless/iwlwifi/Kconfig"
-source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
-source "drivers/net/wireless/zd1211rw/Kconfig"
-source "drivers/net/wireless/rt2x00/Kconfig"
+source "drivers/net/wireless/hostap/Kconfig"
+source "drivers/net/wireless/ipw2x00/Kconfig"
+source "drivers/net/wireless/iwlwifi/Kconfig"
+source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+source "drivers/net/wireless/libertas/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
+source "drivers/net/wireless/p54/Kconfig"
+source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/wl12xx/Kconfig"
-source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+source "drivers/net/wireless/zd1211rw/Kconfig"
 
 endif # WLAN
drivers/net/wireless/libertas/Makefile +12 -2
Index: linux-wl/drivers/net/wireless/libertas/Makefile
===================================================================
@@ -1,5 +1,15 @@
-libertas-objs := main.o wext.o rx.o tx.o cmd.o cmdresp.o scan.o 11d.o	\
-		 debugfs.o persistcfg.o ethtool.o assoc.o
+libertas-y += 11d.o
+libertas-y += assoc.o
+libertas-y += cmd.o
+libertas-y += cmdresp.o
+libertas-y += debugfs.o
+libertas-y += ethtool.o
+libertas-y += main.o
+libertas-y += persistcfg.o
+libertas-y += rx.o
+libertas-y += scan.o
+libertas-y += tx.o
+libertas-y += wext.o
 
 usb8xxx-objs += if_usb.o
 libertas_cs-objs += if_cs.o
drivers/net/wireless/libertas/Kconfig new file +40 -0
Index: linux-wl/drivers/net/wireless/libertas/Kconfig
===================================================================
@@ -0,0 +1,40 @@
+config LIBERTAS
+	tristate "Marvell 8xxx Libertas WLAN driver support"
+	depends on WLAN_80211
+	select WIRELESS_EXT
+	select WEXT_SPY
+	select LIB80211
+	select FW_LOADER
+	---help---
+	  A library for Marvell Libertas 8xxx devices.
+
+config LIBERTAS_USB
+	tristate "Marvell Libertas 8388 USB 802.11b/g cards"
+	depends on LIBERTAS && USB
+	---help---
+	  A driver for Marvell Libertas 8388 USB devices.
+
+config LIBERTAS_CS
+	tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
+	depends on LIBERTAS && PCMCIA
+	select FW_LOADER
+	---help---
+	  A driver for Marvell Libertas 8385 CompactFlash devices.
+
+config LIBERTAS_SDIO
+	tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
+	depends on LIBERTAS && MMC
+	---help---
+	  A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
+
+config LIBERTAS_SPI
+	tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
+	depends on LIBERTAS && SPI
+	---help---
+	  A driver for Marvell Libertas 8686 SPI devices.
+
+config LIBERTAS_DEBUG
+	bool "Enable full debugging output in the Libertas module."
+	depends on LIBERTAS
+	---help---
+	  Debugging support.
Signature · 1 line
http://www.holgerschurig.de
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Holger Schurig

Also sorts all "source" lines in the wireless/Kconfig.

Yeah, we've got a lot more options now.

Quoted 147 lines

Index: linux-wl/drivers/net/wireless/Kconfig
===================================================================

drivers/net/wireless/Kconfig +8 -48
@@ -139,47 +139,6 @@ config PCMCIA_RAYCS
 	  To compile this driver as a module, choose M here: the module will be
 	  called ray_cs.  If unsure, say N.
 
-config LIBERTAS
-	tristate "Marvell 8xxx Libertas WLAN driver support"
-	depends on WLAN_80211
-	select WIRELESS_EXT
-	select WEXT_SPY
-	select LIB80211
-	select FW_LOADER
-	---help---
-	  A library for Marvell Libertas 8xxx devices.
-
-config LIBERTAS_USB
-	tristate "Marvell Libertas 8388 USB 802.11b/g cards"
-	depends on LIBERTAS && USB
-	---help---
-	  A driver for Marvell Libertas 8388 USB devices.
-
-config LIBERTAS_CS
-	tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
-	depends on LIBERTAS && PCMCIA
-	select FW_LOADER
-	---help---
-	  A driver for Marvell Libertas 8385 CompactFlash devices.
-
-config LIBERTAS_SDIO
-	tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
-	depends on LIBERTAS && MMC
-	---help---
-	  A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
-
-config LIBERTAS_SPI
-	tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
-	depends on LIBERTAS && SPI
-	---help---
-	  A driver for Marvell Libertas 8686 SPI devices.
-
-config LIBERTAS_DEBUG
-	bool "Enable full debugging output in the Libertas module."
-	depends on LIBERTAS
-	---help---
-	  Debugging support.
-
 config LIBERTAS_THINFIRM
 	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
 	depends on WLAN_80211 && MAC80211
@@ -491,17 +450,18 @@ config MWL8K
 	  To compile this driver as a module, choose M here: the module
 	  will be called mwl8k.  If unsure, say N.
 
-source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/ipw2x00/Kconfig"
-source "drivers/net/wireless/iwlwifi/Kconfig"
-source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"
-source "drivers/net/wireless/zd1211rw/Kconfig"
-source "drivers/net/wireless/rt2x00/Kconfig"
+source "drivers/net/wireless/hostap/Kconfig"
+source "drivers/net/wireless/ipw2x00/Kconfig"
+source "drivers/net/wireless/iwlwifi/Kconfig"
+source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+source "drivers/net/wireless/libertas/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
+source "drivers/net/wireless/p54/Kconfig"
+source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/wl12xx/Kconfig"
-source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+source "drivers/net/wireless/zd1211rw/Kconfig"
 
 endif # WLAN

Index: linux-wl/drivers/net/wireless/libertas/Makefile
===================================================================

drivers/net/wireless/libertas/Makefile +12 -2
@@ -1,5 +1,15 @@
-libertas-objs := main.o wext.o rx.o tx.o cmd.o cmdresp.o scan.o 11d.o	\
-		 debugfs.o persistcfg.o ethtool.o assoc.o
+libertas-y += 11d.o
+libertas-y += assoc.o
+libertas-y += cmd.o
+libertas-y += cmdresp.o
+libertas-y += debugfs.o
+libertas-y += ethtool.o
+libertas-y += main.o
+libertas-y += persistcfg.o
+libertas-y += rx.o
+libertas-y += scan.o
+libertas-y += tx.o
+libertas-y += wext.o
 
 usb8xxx-objs += if_usb.o
 libertas_cs-objs += if_cs.o

Index: linux-wl/drivers/net/wireless/libertas/Kconfig
===================================================================

drivers/net/wireless/libertas/Kconfig new file +40 -0
@@ -0,0 +1,40 @@
+config LIBERTAS
+	tristate "Marvell 8xxx Libertas WLAN driver support"
+	depends on WLAN_80211
+	select WIRELESS_EXT
+	select WEXT_SPY
+	select LIB80211
+	select FW_LOADER
+	---help---
+	  A library for Marvell Libertas 8xxx devices.
+
+config LIBERTAS_USB
+	tristate "Marvell Libertas 8388 USB 802.11b/g cards"
+	depends on LIBERTAS && USB
+	---help---
+	  A driver for Marvell Libertas 8388 USB devices.
+
+config LIBERTAS_CS
+	tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
+	depends on LIBERTAS && PCMCIA
+	select FW_LOADER
+	---help---
+	  A driver for Marvell Libertas 8385 CompactFlash devices.
+
+config LIBERTAS_SDIO
+	tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
+	depends on LIBERTAS && MMC
+	---help---
+	  A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
+
+config LIBERTAS_SPI
+	tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
+	depends on LIBERTAS && SPI
+	---help---
+	  A driver for Marvell Libertas 8686 SPI devices.
+
+config LIBERTAS_DEBUG
+	bool "Enable full debugging output in the Libertas module."
+	depends on LIBERTAS
+	---help---
+	  Debugging support.
#2 lore raw
Quoted 8 lines · Dan Williams
Quoted 3 lines · Holger Schurig

Also sorts all "source" lines in the wireless/Kconfig.

Yeah, we've got a lot more options now.

LIBERTAS_CS does a "select FW_LOADER" that's already selected by LIBERTAS, so we should probably remove that line. Probably worth a separate (trivial) patch?

-Andrey

Quoted 152 lines
Quoted 136 lines

Index: linux-wl/drivers/net/wireless/Kconfig
===================================================================

drivers/net/wireless/Kconfig     2009-10-06 07:58:05.000000000 +0200 renamed from drivers/net/wireless/Kconfig        2009-10-06 07:55:26.000000000 +0200 +0 -0
@@ -139,47 +139,6 @@ config PCMCIA_RAYCS

        To compile this driver as a module, choose M here: the module will be called ray_cs.  If unsure, say N.

drivers/net/wireless/Kconfig     2009-10-06 07:58:05.000000000 +0200 renamed from drivers/net/wireless/Kconfig        2009-10-06 07:55:26.000000000 +0200 +0 -41
-config LIBERTAS
-     tristate "Marvell 8xxx Libertas WLAN driver support"
-     depends on WLAN_80211
-     select WIRELESS_EXT
-     select WEXT_SPY
-     select LIB80211
-     select FW_LOADER
-     ---help---
-       A library for Marvell Libertas 8xxx devices.
-
-config LIBERTAS_USB
-     tristate "Marvell Libertas 8388 USB 802.11b/g cards"
-     depends on LIBERTAS && USB
-     ---help---
-       A driver for Marvell Libertas 8388 USB devices.
-
-config LIBERTAS_CS
-     tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
-     depends on LIBERTAS && PCMCIA
-     select FW_LOADER
-     ---help---
-       A driver for Marvell Libertas 8385 CompactFlash devices.
-
-config LIBERTAS_SDIO
-     tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
-     depends on LIBERTAS && MMC
-     ---help---
-       A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
-
-config LIBERTAS_SPI
-     tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
-     depends on LIBERTAS && SPI
-     ---help---
-       A driver for Marvell Libertas 8686 SPI devices.
-
-config LIBERTAS_DEBUG
-     bool "Enable full debugging output in the Libertas module."
-     depends on LIBERTAS
-     ---help---
-       Debugging support.
-

 config LIBERTAS_THINFIRM
      tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware" depends on WLAN_80211 && MAC80211

drivers/net/wireless/Kconfig     2009-10-06 07:58:05.000000000 +0200 renamed from drivers/net/wireless/Kconfig        2009-10-06 07:55:26.000000000 +0200 +0 -0
@@ -491,17 +450,18 @@ config MWL8K

        To compile this driver as a module, choose M here: the module will be called mwl8k.  If unsure, say N.

-source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/ath/Kconfig"

drivers/net/wireless/Kconfig     2009-10-06 07:58:05.000000000 +0200 renamed from drivers/net/wireless/Kconfig        2009-10-06 07:55:26.000000000 +0200 +0 -3
-source "drivers/net/wireless/ipw2x00/Kconfig"
-source "drivers/net/wireless/iwlwifi/Kconfig"
-source "drivers/net/wireless/hostap/Kconfig"

 source "drivers/net/wireless/b43/Kconfig"
 source "drivers/net/wireless/b43legacy/Kconfig"

drivers/net/wireless/Kconfig     2009-10-06 07:58:05.000000000 +0200 renamed from drivers/net/wireless/Kconfig        2009-10-06 07:55:26.000000000 +0200 +5 -2
-source "drivers/net/wireless/zd1211rw/Kconfig"
-source "drivers/net/wireless/rt2x00/Kconfig"
+source "drivers/net/wireless/hostap/Kconfig"
+source "drivers/net/wireless/ipw2x00/Kconfig"
+source "drivers/net/wireless/iwlwifi/Kconfig"
+source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+source "drivers/net/wireless/libertas/Kconfig"

 source "drivers/net/wireless/orinoco/Kconfig"

drivers/net/wireless/Kconfig     2009-10-06 07:58:05.000000000 +0200 renamed from drivers/net/wireless/Kconfig        2009-10-06 07:55:26.000000000 +0200 +2 -0
+source "drivers/net/wireless/p54/Kconfig"
+source "drivers/net/wireless/rt2x00/Kconfig"

 source "drivers/net/wireless/wl12xx/Kconfig"

drivers/net/wireless/Kconfig     2009-10-06 07:58:05.000000000 +0200 renamed from drivers/net/wireless/Kconfig        2009-10-06 07:55:26.000000000 +0200 +1 -1
-source "drivers/net/wireless/iwmc3200wifi/Kconfig"
+source "drivers/net/wireless/zd1211rw/Kconfig"

 endif # WLAN
Index: linux-wl/drivers/net/wireless/libertas/Makefile
===================================================================

drivers/net/wireless/libertas/Makefile   2009-10-06 07:58:25.000000000 +0200 renamed from drivers/net/wireless/libertas/Makefile      2009-10-06 07:55:26.000000000 +0200 +12 -2
@@ -1,5 +1,15 @@
-libertas-objs := main.o wext.o rx.o tx.o cmd.o cmdresp.o scan.o 11d.o        \
-              debugfs.o persistcfg.o ethtool.o assoc.o
+libertas-y += 11d.o
+libertas-y += assoc.o
+libertas-y += cmd.o
+libertas-y += cmdresp.o
+libertas-y += debugfs.o
+libertas-y += ethtool.o
+libertas-y += main.o
+libertas-y += persistcfg.o
+libertas-y += rx.o
+libertas-y += scan.o
+libertas-y += tx.o
+libertas-y += wext.o
 

 usb8xxx-objs += if_usb.o
 libertas_cs-objs += if_cs.o
Index: linux-wl/drivers/net/wireless/libertas/Kconfig
===================================================================

drivers/net/wireless/libertas/Kconfig    2009-10-06 07:58:15.000000000 +0200 renamed from dev/null 1970-01-01 00:00:00.000000000 +0000 +30 -0
@@ -0,0 +1,40 @@
+config LIBERTAS
+     tristate "Marvell 8xxx Libertas WLAN driver support"
+     depends on WLAN_80211
+     select WIRELESS_EXT
+     select WEXT_SPY
+     select LIB80211
+     select FW_LOADER
+     ---help---
+       A library for Marvell Libertas 8xxx devices.
+
+config LIBERTAS_USB
+     tristate "Marvell Libertas 8388 USB 802.11b/g cards"
+     depends on LIBERTAS && USB
+     ---help---
+       A driver for Marvell Libertas 8388 USB devices.
+
+config LIBERTAS_CS
+     tristate "Marvell Libertas 8385 CompactFlash 802.11b/g cards"
+     depends on LIBERTAS && PCMCIA
+     select FW_LOADER
+     ---help---
+       A driver for Marvell Libertas 8385 CompactFlash devices.
+
+config LIBERTAS_SDIO
+     tristate "Marvell Libertas 8385/8686/8688 SDIO 802.11b/g cards"
+     depends on LIBERTAS && MMC
+     ---help---
+       A driver for Marvell Libertas 8385/8686/8688 SDIO devices.
+
+config LIBERTAS_SPI

drivers/net/wireless/libertas/Kconfig    2009-10-06 07:58:15.000000000 +0200 line 40

Quoted 10 lines
drivers/net/wireless/libertas/Kconfig    2009-10-06 07:58:15.000000000 +0200 renamed from dev/null 1970-01-01 00:00:00.000000000 +0000 +10 -0
+     tristate "Marvell Libertas 8686 SPI 802.11b/g cards"
+     depends on LIBERTAS && SPI
+     ---help---
+       A driver for Marvell Libertas 8686 SPI devices.
+
+config LIBERTAS_DEBUG
+     bool "Enable full debugging output in the Libertas module."
+     depends on LIBERTAS
+     ---help---
+       Debugging support.

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html