compat-wireless: turn on TESTMODE and MAC DEBUGFS, turn off BT

[wl12xx/compat-wireless.git] / Makefile

diff --git a/Makefile b/Makefile
index ca1dd21744751cf050b58c7abef9dbd9e53bb680..a020661a89f71430e50bab582b750ad8b58ca6ae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,21 +27,18 @@ ifeq ($(BT),)
 obj-$(CONFIG_COMPAT_WIRELESS) += net/wireless/ net/mac80211/
 obj-$(CONFIG_COMPAT_WIRELESS_MODULES) += drivers/net/wireless/
 
-obj-$(CONFIG_COMPAT_NET_USB_MODULES) += drivers/net/usb/
 
-obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/
-obj-$(CONFIG_COMPAT_VAR_MODULES) +=  drivers/ssb/ drivers/misc/eeprom/
-endif
-
-obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
-obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/
+obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/ethernet/atheros/
+obj-$(CONFIG_COMPAT_NETWORK_MODULES) += drivers/net/ethernet/broadcom/
 
 
 ifeq ($(CONFIG_STAGING_EXCLUDE_BUILD),)
-obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/ath6kl/
-obj-$(CONFIG_COMPAT_STAGING) += drivers/staging/brcm80211/
 endif
 
+endif
+
+obj-$(CONFIG_COMPAT_BLUETOOTH) += net/bluetooth/
+obj-$(CONFIG_COMPAT_BLUETOOTH_MODULES) += drivers/bluetooth/
 
 else
 
@@ -94,19 +91,32 @@ bt-install-modules: bt
        @echo
        @echo "Currently detected bluetooth subsystem modules:"
        @echo
-       @$(MODPROBE) -l sco
-       @$(MODPROBE) -l l2cap
-       @$(MODPROBE) -l hidp
-       @$(MODPROBE) -l rfcomm
+       @$(MODPROBE) -l ath3k       
+       @$(MODPROBE) -l bcm203x
+       @$(MODPROBE) -l bluecard_cs
+       @$(MODPROBE) -l bluetooth
        @$(MODPROBE) -l bnep
+       @$(MODPROBE) -l bpa10x
+       @$(MODPROBE) -l bt3c_cs
+       @$(MODPROBE) -l btmrvl
+       @$(MODPROBE) -l btmrvl_sdio
+       @$(MODPROBE) -l btsdio
        @$(MODPROBE) -l btusb
-       @$(MODPROBE) -l bluetooth
+       @$(MODPROBE) -l btuart_cs
+       @$(MODPROBE) -l cmtp
+       @$(MODPROBE) -l dtl1_cs
+       @$(MODPROBE) -l hidp
+       @$(MODPROBE) -l hci_vhci
+       @$(MODPROBE) -l hci_uart
+       @$(MODPROBE) -l l2cap
+       @$(MODPROBE) -l rfcomm
+       @$(MODPROBE) -l sco
        @echo
        @echo Now run:
        @echo
        @echo sudo make btunload:
        @echo
-       @echo And the load the needed bluetooth modules. If unsure reboot.
+       @echo And then load the needed bluetooth modules. If unsure reboot.
        @echo
 
 btuninstall:
@@ -119,14 +129,26 @@ btuninstall:
        @echo
        @echo "Your old bluetooth subsystem modules were left intact:"
        @echo
-       @$(MODPROBE) -l sco
-       @$(MODPROBE) -l l2cap
-       @$(MODPROBE) -l hidp
-       @$(MODPROBE) -l rfcomm
+       @$(MODPROBE) -l ath3k       
+       @$(MODPROBE) -l bcm203x
+       @$(MODPROBE) -l bluecard_cs
+       @$(MODPROBE) -l bluetooth
        @$(MODPROBE) -l bnep
+       @$(MODPROBE) -l bpa10x
+       @$(MODPROBE) -l bt3c_cs
+       @$(MODPROBE) -l btmrvl
+       @$(MODPROBE) -l btmrvl_sdio
+       @$(MODPROBE) -l btsdio
        @$(MODPROBE) -l btusb
-       @$(MODPROBE) -l bluetooth
-       @
+       @$(MODPROBE) -l btuart_cs
+       @$(MODPROBE) -l cmtp
+       @$(MODPROBE) -l dtl1_cs
+       @$(MODPROBE) -l hidp
+       @$(MODPROBE) -l hci_vhci
+       @$(MODPROBE) -l hci_uart
+       @$(MODPROBE) -l l2cap
+       @$(MODPROBE) -l rfcomm
+       @$(MODPROBE) -l sco
        @echo
 
 btclean:
@@ -138,7 +160,6 @@ install: uninstall install-modules install-scripts
 install-modules: modules
        $(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \
                modules_install
-       @./scripts/update-initramfs
 
 install-scripts:
        @# All the scripts we can use
@@ -247,32 +268,54 @@ install-scripts:
        @$(MODPROBE) -l rt73usb
        @$(MODPROBE) -l rtl8180
        @$(MODPROBE) -l rtl8187
+       @$(MODPROBE) -l rtlwifi
+       @$(MODPROBE) -l rtl8192ce
        @$(MODPROBE) -l spectrum_cs
        @$(MODPROBE) -l ssb
        @$(MODPROBE) -l usb8xxx
        @$(MODPROBE) -l usbnet
        @$(MODPROBE) -l wl1251
-       @$(MODPROBE) -l wl1271
+       @$(MODPROBE) -l wl12xx
        @$(MODPROBE) -l zd1211rw
        @echo
+       @echo "Currently detected ethernet subsystem modules:"
+       @echo
+       @$(MODPROBE) -l atl1
+       @$(MODPROBE) -l atl2
+       @$(MODPROBE) -l atl1e
+       @$(MODPROBE) -l atl1c
+       @echo
        @echo "Currently detected bluetooth subsystem modules:"
        @echo
-       @$(MODPROBE) -l sco
-       @$(MODPROBE) -l l2cap
-       @$(MODPROBE) -l hidp
-       @$(MODPROBE) -l rfcomm
+       @$(MODPROBE) -l ath3k           
+       @$(MODPROBE) -l bcm203x
+       @$(MODPROBE) -l bluecard_cs
+       @$(MODPROBE) -l bluetooth
        @$(MODPROBE) -l bnep
+       @$(MODPROBE) -l bpa10x
+       @$(MODPROBE) -l bt3c_cs
+       @$(MODPROBE) -l btmrvl
+       @$(MODPROBE) -l btmrvl_sdio
+       @$(MODPROBE) -l btsdio
        @$(MODPROBE) -l btusb
-       @$(MODPROBE) -l bluetooth
+       @$(MODPROBE) -l btuart_cs
+       @$(MODPROBE) -l cmtp
+       @$(MODPROBE) -l dtl1_cs
+       @$(MODPROBE) -l hidp
+       @$(MODPROBE) -l hci_vhci
+       @$(MODPROBE) -l hci_uart
+       @$(MODPROBE) -l l2cap
+       @$(MODPROBE) -l rfcomm
+       @$(MODPROBE) -l sco
        @echo 
        @echo Now run:
        @echo 
-       @echo sudo make unload to unload both wireless and bluetooth modules
+       @echo sudo make unload to unload all: wireless, bluetooth and ethernet modules
        @echo sudo make wlunload to unload wireless modules
        @echo sudo make btunload to unload bluetooth modules
        @echo
-       @echo And then load the wireless or bluetooth module you need. If unsure reboot.
-       @echo Alternatively use "sudo make load/wlload/btload" to load modules
+       @echo Run sudo modprobe 'driver-name' to load your desired driver. 
+       @echo If unsure reboot.
        @echo
 
 uninstall:
@@ -281,12 +324,12 @@ uninstall:
        @rm -rf $(KLIB)/$(KMODDIR)/net/mac80211/
        @rm -rf $(KLIB)/$(KMODDIR)/net/rfkill/
        @rm -rf $(KLIB)/$(KMODDIR)/net/wireless/
-       @rm -rf $(KLIB)/$(KMODDIR)/drivers/ssb/
        @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/usb/
        @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/wireless/
+       @rm -rf $(KLIB)/$(KMODDIR)/drivers/staging/
+       @rm -rf $(KLIB)/$(KMODDIR)/drivers/net/atl*
        @# Lets only remove the stuff we are sure we are providing
        @# on the misc directory.
-       @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom/eeprom_93cx6.ko*
        @rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom_93cx6.ko*
        @rm -f $(KLIB)/$(KMODDIR)/drivers/net/b44.ko*
        @/sbin/depmod -a
@@ -354,23 +397,45 @@ uninstall:
        @$(MODPROBE) -l rt73usb
        @$(MODPROBE) -l rtl8180
        @$(MODPROBE) -l rtl8187
+       @$(MODPROBE) -l rtlwifi
+       @$(MODPROBE) -l rtl8192ce
        @$(MODPROBE) -l spectrum_cs
        @$(MODPROBE) -l ssb
        @$(MODPROBE) -l usb8xxx
        @$(MODPROBE) -l usbnet
        @$(MODPROBE) -l wl1251
-       @$(MODPROBE) -l wl1271
+       @$(MODPROBE) -l wl12xx
        @$(MODPROBE) -l zd1211rw
        @echo
+       @echo "Your old ethernet subsystem modules are left intact:"
+       @echo
+       @$(MODPROBE) -l atl1
+       @$(MODPROBE) -l atl2
+       @$(MODPROBE) -l atl1e
+       @$(MODPROBE) -l atl1c
+       @echo
        @echo "Your old bluetooth subsystem modules were left intact:"
        @echo
-       @$(MODPROBE) -l sco
-       @$(MODPROBE) -l l2cap
-       @$(MODPROBE) -l hidp
-       @$(MODPROBE) -l rfcomm
+       @$(MODPROBE) -l ath3k           
+       @$(MODPROBE) -l bcm203x
+       @$(MODPROBE) -l bluecard_cs
+       @$(MODPROBE) -l bluetooth
        @$(MODPROBE) -l bnep
+       @$(MODPROBE) -l bpa10x
+       @$(MODPROBE) -l bt3c_cs
+       @$(MODPROBE) -l btmrvl
+       @$(MODPROBE) -l btmrvl_sdio
+       @$(MODPROBE) -l btsdio
        @$(MODPROBE) -l btusb
-       @$(MODPROBE) -l bluetooth
+       @$(MODPROBE) -l btuart_cs
+       @$(MODPROBE) -l cmtp
+       @$(MODPROBE) -l dtl1_cs
+       @$(MODPROBE) -l hidp
+       @$(MODPROBE) -l hci_vhci
+       @$(MODPROBE) -l hci_uart
+       @$(MODPROBE) -l l2cap
+       @$(MODPROBE) -l rfcomm
+       @$(MODPROBE) -l sco
        @
        @echo 
 
@@ -382,22 +447,14 @@ clean:
 unload:
        @./scripts/unload.sh
 
-load: unload
-       @./scripts/load.sh
-
 btunload:
        @./scripts/btunload.sh
 
-btload: btunload
-       @./scripts/btload.sh
-
 wlunload:
        @./scripts/wlunload.sh
 
-wlload: wlunload
-       @./scripts/wlload.sh
 
-.PHONY: all clean install uninstall unload load btunload btload wlunload wlload modules bt
+.PHONY: all clean install uninstall unload btunload wlunload modules bt
 
 endif