diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-07-20 23:24:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 23:24:22 +0200 |
| commit | 5a7639c2f620aebe30df18af42d61eb5307f4d6d (patch) | |
| tree | 66a4791b1bd5c20967aea465d61819378e653b2c /package/kernel | |
| parent | 0b4cf150b54a8a037d0c825e5b7336b3987e9b58 (diff) | |
| parent | 6567a9614b14663b1cbbb699e35eb8443d2fb5e2 (diff) | |
| download | master-187ad058-5a7639c2f620aebe30df18af42d61eb5307f4d6d.tar.gz master-187ad058-5a7639c2f620aebe30df18af42d61eb5307f4d6d.tar.bz2 master-187ad058-5a7639c2f620aebe30df18af42d61eb5307f4d6d.zip | |
Merge pull request #36 from wigyori/master
refresh uboot-lantiq patches, update prism54 packaging
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/linux/modules/wireless.mk | 17 | ||||
| -rw-r--r-- | package/kernel/mac80211/Makefile | 48 |
2 files changed, 4 insertions, 61 deletions
diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk index d7c4425c8c..72e2bf477b 100644 --- a/package/kernel/linux/modules/wireless.mk +++ b/package/kernel/linux/modules/wireless.mk @@ -10,7 +10,7 @@ WIRELESS_MENU:=Wireless Drivers define KernelPackage/net-prism54 SUBMENU:=$(WIRELESS_MENU) TITLE:=Intersil Prism54 support - DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT + DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT +prism54-firmware KCONFIG:=CONFIG_PRISM54 FILES:= \ $(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko@lt4.5 \ @@ -22,21 +22,6 @@ define KernelPackage/net-prism54/description Kernel modules for Intersil Prism54 support endef -# Prism54 FullMAC firmware (jbnore.free.fr seems to be rather slow, so we use daemonizer.de) -PRISM54_FW:=1.0.4.3.arm - -define Download/net-prism54 - FILE:=$(PRISM54_FW) - URL:=http://daemonizer.de/prism54/prism54-fw/fw-fullmac/ - MD5SUM:=8bd4310971772a486b9784c77f8a6df9 -endef - -define KernelPackage/net-prism54/install - $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(PRISM54_FW) $(1)/lib/firmware/isl3890 -endef - -$(eval $(call Download,net-prism54)) $(eval $(call KernelPackage,net-prism54)) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 72184f61c8..eaba6ed6b2 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -1056,33 +1056,6 @@ define KernelPackage/mwifiex-pcie/description Kernel modules for Marvell 802.11n/802.11ac PCIe Wireless cards endef - -# Prism54 drivers -P54PCIFW:=2.13.12.0.arm -P54USBFW:=2.13.24.0.lm87.arm -P54SPIFW:=2.13.0.0.a.13.14.arm - -define Download/p54usb - FILE:=$(P54USBFW) - URL:=http://daemonizer.de/prism54/prism54-fw/fw-usb - MD5SUM:=8e8ab005a4f8f0123bcdc51bc25b47f6 -endef -$(eval $(call Download,p54usb)) - -define Download/p54pci - FILE:=$(P54PCIFW) - URL:=http://daemonizer.de/prism54/prism54-fw/fw-softmac - MD5SUM:=ff7536af2092b1c4b21315bd103ef4c4 -endef -$(eval $(call Download,p54pci)) - -define Download/p54spi - FILE:=$(P54SPIFW) - URL:=http://daemonizer.de/prism54/prism54-fw/stlc4560 - MD5SUM:=42661f8ecbadd88012807493f596081d -endef -$(eval $(call Download,p54spi)) - define KernelPackage/p54/Default $(call KernelPackage/mac80211/Default) TITLE:=Prism54 Drivers @@ -1102,7 +1075,7 @@ endef define KernelPackage/p54-pci $(call KernelPackage/p54/Default) TITLE+= (PCI) - DEPENDS+= @PCI_SUPPORT +kmod-p54-common + DEPENDS+= @PCI_SUPPORT +kmod-p54-common +p54-pci-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54pci.ko AUTOLOAD:=$(call AutoProbe,p54pci) endef @@ -1110,7 +1083,7 @@ endef define KernelPackage/p54-usb $(call KernelPackage/p54/Default) TITLE+= (USB) - DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common + DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common +p54-usb-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54usb.ko AUTOLOAD:=$(call AutoProbe,p54usb) endef @@ -1118,7 +1091,7 @@ endef define KernelPackage/p54-spi $(call KernelPackage/p54/Default) TITLE+= (SPI) - DEPENDS+= @TARGET_omap24xx +kmod-p54-common + DEPENDS+= @TARGET_omap24xx +kmod-p54-common +p54-spi-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54spi.ko AUTOLOAD:=$(call AutoProbe,p54spi) endef @@ -1765,21 +1738,6 @@ define KernelPackage/ipw2200/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware endef -define KernelPackage/p54-pci/install - $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(P54PCIFW) $(1)/lib/firmware/isl3886pci -endef - -define KernelPackage/p54-usb/install - $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(P54USBFW) $(1)/lib/firmware/isl3887usb -endef - -define KernelPackage/p54-spi/install - $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(P54SPIFW) $(1)/lib/firmware/3826.arm -endef - define KernelPackage/zd1211rw/install $(INSTALL_DIR) $(1)/lib/firmware/zd1211 $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211 |