On Wednesday, June 29, 2016 11:13:01 PM Hauke Mehrtens wrote: > From: Hauke Mehrtens <hauke.mehrt...@intel.com> > > Extract the other p54 firmware files into the prism54-firmware package. > > Signed-off-by: Hauke Mehrtens <hauke.mehrt...@intel.com> Hey, that's really nice of you.
Would it be possible to set PKG_VERSION to like 1.0 and add a variable for PRISM54FW:=1.0.4.3.arm and set the PKG_SOURCE:=$(PRISM54FW) instead? Regards, Christian > --- > package/firmware/prism54-firmware/Makefile | 75 > ++++++++++++++++++++++++++++-- > package/kernel/mac80211/Makefile | 48 ++----------------- > 2 files changed, 75 insertions(+), 48 deletions(-) > > diff --git a/package/firmware/prism54-firmware/Makefile > b/package/firmware/prism54-firmware/Makefile > index 759e6b0..2f39dc9 100644 > --- a/package/firmware/prism54-firmware/Makefile > +++ b/package/firmware/prism54-firmware/Makefile > @@ -9,20 +9,70 @@ PKG_NAME:=prism54-firmware > PKG_VERSION:=1.0.4.3 > PKG_RELEASE:=1 > > +PRG_URL:=https://daemonizer.de/prism54/prism54-fw/ > + > # Prism54 FullMAC firmware (jbnore.free.fr seems to be rather slow, so we > use daemonizer.de) > PKG_SOURCE:=$(PKG_VERSION).arm > -PKG_SOURCE_URL:=https://daemonizer.de/prism54/prism54-fw/fw-fullmac/ > +PKG_SOURCE_URL:=$(PRG_URL)/fw-fullmac/ > PKG_MD5SUM:=8bd4310971772a486b9784c77f8a6df9 > > include $(INCLUDE_DIR)/package.mk > > -define Package/prism54-firmware > + > +# Prism54 drivers > +P54USBFW:=2.13.24.0.lm87.arm > +P54PCIFW:=2.13.12.0.arm > +P54SPIFW:=2.13.0.0.a.13.14.arm > + > +define Download/p54-usb-firmware > + FILE:=$(P54USBFW) > + URL:=$(PRG_URL)/fw-usb > + MD5SUM:=8e8ab005a4f8f0123bcdc51bc25b47f6 > +endef > +$(eval $(call Download,p54-usb-firmware)) > + > +define Download/p54-pci-firmware > + FILE:=$(P54PCIFW) > + URL:=$(PRG_URL)/fw-softmac > + MD5SUM:=ff7536af2092b1c4b21315bd103ef4c4 > +endef > +$(eval $(call Download,p54-pci-firmware)) > + > +define Download/p54-spi-firmware > + FILE:=$(P54SPIFW) > + URL:=$(PRG_URL)/stlc4560 > + MD5SUM:=42661f8ecbadd88012807493f596081d > +endef > +$(eval $(call Download,p54-spi-firmware)) > + > + > +define Package/prism54-firmware-default > SECTION:=firmware > CATEGORY:=Firmware > - URL:=https://daemonizer.de/prism54/prism54-fw > + URL:=https://daemonizer.de/prism54/prism54-fw/ > +endef > + > +define Package/prism54-firmware > +$(Package/prism54-firmware-default) > TITLE:=prism54 firmware > endef > > +define Package/p54-usb-firmware > +$(Package/prism54-firmware-default) > + TITLE:=p54-usb firmware > +endef > + > +define Package/p54-pci-firmware > +$(Package/prism54-firmware-default) > + TITLE:=p54-pci firmware > +endef > + > +define Package/p54-spi-firmware > +$(Package/prism54-firmware-default) > + TITLE:=p54-spi firmware > +endef > + > + > define Build/Prepare > mkdir -p $(PKG_BUILD_DIR) > endef > @@ -36,4 +86,23 @@ define Package/prism54-firmware/install > $(INSTALL_DATA) $(DL_DIR)/$(PKG_SOURCE) $(1)/lib/firmware/isl3890 > endef > > +define Package/p54-usb-firmware/install > + $(INSTALL_DIR) $(1)/lib/firmware > + $(INSTALL_DATA) $(DL_DIR)/$(P54USBFW) $(1)/lib/firmware/isl3887usb > +endef > + > +define Package/p54-pci-firmware/install > + $(INSTALL_DIR) $(1)/lib/firmware > + $(INSTALL_DATA) $(DL_DIR)/$(P54PCIFW) $(1)/lib/firmware/isl3886pci > +endef > + > +define Package/p54-spi-firmware/install > + $(INSTALL_DIR) $(1)/lib/firmware > + $(INSTALL_DATA) $(DL_DIR)/$(P54SPIFW) $(1)/lib/firmware/3826.arm > +endef > + > + > $(eval $(call BuildPackage,prism54-firmware)) > +$(eval $(call BuildPackage,p54-usb-firmware)) > +$(eval $(call BuildPackage,p54-pci-firmware)) > +$(eval $(call BuildPackage,p54-spi-firmware)) > diff --git a/package/kernel/mac80211/Makefile > b/package/kernel/mac80211/Makefile > index bee0723..38eb4af 100644 > --- a/package/kernel/mac80211/Makefile > +++ b/package/kernel/mac80211/Makefile > @@ -1061,33 +1061,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 > @@ -1107,7 +1080,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 > @@ -1115,7 +1088,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 > @@ -1123,7 +1096,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 > @@ -1771,21 +1744,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 > _______________________________________________ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
