diff options
| -rw-r--r-- | package/mac80211/Makefile | 67 | ||||
| -rw-r--r-- | package/mac80211/patches-brcm/001-disable_drivers.patch | 34 | ||||
| -rw-r--r-- | package/mac80211/patches-old/001-disable_drivers.patch | 24 |
3 files changed, 86 insertions, 39 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 177442dee..2e17b3c58 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -27,8 +27,10 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_kmod-mac80211) +WMENU:=Wireless Drivers + define KernelPackage/mac80211 - SUBMENU:=Wireless Drivers + SUBMENU:=$(WMENU) TITLE:=Linux 802.11 Wireless Networking Stack URL:=http://linuxwireless.org/ DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools @!TARGET_avr32 @@ -42,6 +44,49 @@ define KernelPackage/mac80211/description Linux 802.11 Wireless Networking Stack endef +# Prism54 drivers +P54FW:=2.7.0.0.arm + +define Download/p54 + FILE:=$(P54FW) + URL:=http://prism54.org/firmware + MD5SUM:=09f9da7ea757173c9de1a0322a1f9782 +endef +$(eval $(call Download,p54)) + +define KernelPackage/p54/Default + SUBMENU:=$(WMENU) + TITLE:=Prism54 Drivers +endef + +define KernelPackage/p54/description + Kernel module for Prism54 chipsets (mac80211) +endef + +define KernelPackage/p54-common + $(call KernelPackage/p54/Default) + DEPENDS+= @PCI_SUPPORT||USB_SUPPORT + TITLE+= (COMMON) + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54common.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,p54common) +endef + +define KernelPackage/p54-pci + $(call KernelPackage/p54/Default) + TITLE+= (PCI) + DEPENDS+= @PCI_SUPPORT +kmod-p54-common + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54pci.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,31,p54pci) +endef + +define KernelPackage/p54-usb + $(call KernelPackage/p54/Default) + TITLE+= (USB) + DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common + FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/p54/p54usb.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,31,p54usb) +endef + # Ralink rt2x00 drivers RT61FW:=RT61_Firmware_V1.2.zip RT71FW:=RT71W_Firmware_V1.8.zip @@ -69,7 +114,7 @@ endef $(eval $(call Download,rt2860)) define KernelPackage/rt2x00/Default - SUBMENU:=Wireless Drivers + SUBMENU:=$(WMENU) TITLE:=Ralink Drivers for RT2x00 cards endef @@ -155,7 +200,7 @@ endef $(eval $(call Download,zd1211rw)) define KernelPackage/zd1211rw - SUBMENU:=Wireless Drivers + SUBMENU:=$(WMENU) TITLE:=Zydas ZD1211 support DEPENDS:= @USB_SUPPORT +kmod-usb-core +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX) @@ -163,7 +208,7 @@ define KernelPackage/zd1211rw endef define KernelPackage/ath5k - SUBMENU:=Wireless Drivers + SUBMENU:=$(WMENU) TITLE:=Atheros 5xxx wireless cards support URL:=http://linuxwireless.org/en/users/Drivers/ath5k DEPENDS+= @PCI_SUPPORT +kmod-mac80211 @@ -177,7 +222,7 @@ Atheros 5xxx chipset. endef define KernelPackage/ath9k-new - SUBMENU:=Wireless Drivers + SUBMENU:=$(WMENU) TITLE:=Atheros 802.11n wireless cards support URL:=http://linuxwireless.org/en/users/Drivers/ath9k DEPENDS+= @PCI_SUPPORT +kmod-mac80211 @LINUX_2_6_27||@LINUX_2_6_28 @!kmod-ath9k @@ -191,7 +236,7 @@ Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets. endef define KernelPackage/mac80211-hwsim - SUBMENU:=Wireless Drivers + SUBMENU:=$(WMENU) TITLE:=mac80211 HW simulation device DEPENDS+= +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/mac80211_hwsim.$(LINUX_KMOD_SUFFIX) @@ -240,7 +285,7 @@ endef $(eval $(call Download,b43legacy)) define KernelPackage/b43-common - SUBMENU:=Wireless Drivers + SUBMENU:=$(WMENU) TITLE:=Generic stuff for Broadcom wireless devices URL:=http://linuxwireless.org/en/users/Drivers/b43 DEPENDS:=@TARGET_brcm47xx +kmod-mac80211 @@ -326,6 +371,11 @@ define KernelPackage/mac80211/install $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi endef +define KernelPackage/p54-common/install + $(INSTALL_DIR) $(1)/lib/firmware + $(INSTALL_DATA) $(DL_DIR)/$(P54FW) $(1)/lib/firmware/isl3886 +endef + define KernelPackage/rt61-pci/install $(INSTALL_DIR) $(1)/lib/firmware $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt2?61*.bin $(1)/lib/firmware/ @@ -373,6 +423,9 @@ endef $(eval $(call KernelPackage,ath5k)) $(eval $(call KernelPackage,mac80211)) +$(eval $(call KernelPackage,p54-common)) +$(eval $(call KernelPackage,p54-pci)) +$(eval $(call KernelPackage,p54-usb)) $(eval $(call KernelPackage,rt2x00-lib)) $(eval $(call KernelPackage,rt2x00-pci)) $(eval $(call KernelPackage,rt2x00-usb)) diff --git a/package/mac80211/patches-brcm/001-disable_drivers.patch b/package/mac80211/patches-brcm/001-disable_drivers.patch index a2949d771..440781815 100644 --- a/package/mac80211/patches-brcm/001-disable_drivers.patch +++ b/package/mac80211/patches-brcm/001-disable_drivers.patch @@ -1,6 +1,7 @@ +diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/config.mk --- compat-wireless-2008-08-06/config.mk 2008-07-18 06:11:03.000000000 +0200 -+++ compat-wireless-2008-08-06-new/config.mk 2008-11-09 13:16:02.000000000 +0100 -@@ -72,69 +72,31 @@ ++++ compat-wireless-2008-08-06.new/config.mk 2008-11-15 00:26:38.000000000 +0100 +@@ -72,70 +72,34 @@ CONFIG_ATH5K=m CONFIG_ATH5K_DEBUG=n @@ -68,9 +69,11 @@ -CONFIG_IPW2200_QOS=y - -NEED_IEEE80211=y -- --CONFIG_P54_PCI=m -- ++# CONFIG_B43LEGACY_PIO=y ++# CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y + + CONFIG_P54_PCI=m + -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y @@ -79,12 +82,11 @@ - -CONFIG_RTL8180=m -CONFIG_ADM8211=m -+# CONFIG_B43LEGACY_PIO=y -+# CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y - +- CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2400PCI=m -@@ -159,32 +121,6 @@ + CONFIG_RT2500PCI=m +@@ -159,31 +123,7 @@ ifneq ($(CONFIG_USB),) CONFIG_ZD1211RW=m @@ -111,19 +113,15 @@ -endif -endif - --CONFIG_P54_USB=m + CONFIG_P54_USB=m -CONFIG_RTL8187=m -- + # RT2500USB does not require firmware CONFIG_RT2500USB=m - CONFIG_RT2X00_LIB_USB=m -@@ -209,39 +145,6 @@ - CONFIG_RT2X00_LIB_FIRMWARE=y - endif +@@ -212,36 +152,6 @@ + # p54 + CONFIG_P54_COMMON=m --# p54 --CONFIG_P54_COMMON=m -- -# Sonics Silicon Backplane -CONFIG_SSB_POSSIBLE=y -CONFIG_SSB=m diff --git a/package/mac80211/patches-old/001-disable_drivers.patch b/package/mac80211/patches-old/001-disable_drivers.patch index ccf040915..49bc193f5 100644 --- a/package/mac80211/patches-old/001-disable_drivers.patch +++ b/package/mac80211/patches-old/001-disable_drivers.patch @@ -1,7 +1,7 @@ diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/config.mk --- compat-wireless-2008-08-06/config.mk 2008-07-18 06:11:03.000000000 +0200 -+++ compat-wireless-2008-08-06.new/config.mk 2008-08-20 17:30:13.000000000 +0200 -@@ -72,70 +72,6 @@ ++++ compat-wireless-2008-08-06.new/config.mk 2008-11-15 00:21:17.000000000 +0100 +@@ -72,70 +72,8 @@ CONFIG_ATH5K=m CONFIG_ATH5K_DEBUG=n @@ -58,8 +58,8 @@ diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/co - -NEED_IEEE80211=y - --CONFIG_P54_PCI=m -- + CONFIG_P54_PCI=m + -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y @@ -72,7 +72,7 @@ diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/co CONFIG_RT2X00_LIB_PCI=m CONFIG_RT2400PCI=m CONFIG_RT2500PCI=m -@@ -159,32 +95,6 @@ +@@ -159,31 +97,7 @@ ifneq ($(CONFIG_USB),) CONFIG_ZD1211RW=m @@ -99,19 +99,15 @@ diff -urN compat-wireless-2008-08-06/config.mk compat-wireless-2008-08-06.new/co -endif -endif - --CONFIG_P54_USB=m + CONFIG_P54_USB=m -CONFIG_RTL8187=m -- + # RT2500USB does not require firmware CONFIG_RT2500USB=m - CONFIG_RT2X00_LIB_USB=m -@@ -209,39 +119,6 @@ - CONFIG_RT2X00_LIB_FIRMWARE=y - endif +@@ -212,36 +126,6 @@ + # p54 + CONFIG_P54_COMMON=m --# p54 --CONFIG_P54_COMMON=m -- -# Sonics Silicon Backplane -CONFIG_SSB_POSSIBLE=y -CONFIG_SSB=m |