Author: nbd Date: 2016-01-10 17:36:40 +0100 (Sun, 10 Jan 2016) New Revision: 48181
Added: trunk/package/firmware/linux-firmware/ti.mk Modified: trunk/package/kernel/mac80211/Makefile Log: mac80211: move ti firmware to the linux-firmware package Signed-off-by: Felix Fietkau <[email protected]> Added: trunk/package/firmware/linux-firmware/ti.mk =================================================================== --- trunk/package/firmware/linux-firmware/ti.mk (rev 0) +++ trunk/package/firmware/linux-firmware/ti.mk 2016-01-10 16:36:40 UTC (rev 48181) @@ -0,0 +1,25 @@ +Package/wl12xx-firmware = $(call Package/firmware-default,TI WL12xx firmware) +define Package/wl12xx-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/ti-connectivity + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/ti-connectivity/wl127x-fw-5-mr.bin \ + $(PKG_BUILD_DIR)/ti-connectivity/wl127x-fw-5-plt.bin \ + $(PKG_BUILD_DIR)/ti-connectivity/wl127x-fw-5-sr.bin \ + $(PKG_BUILD_DIR)/ti-connectivity/wl1271-nvs.bin \ + $(PKG_BUILD_DIR)/ti-connectivity/wl128x-fw-5-mr.bin \ + $(PKG_BUILD_DIR)/ti-connectivity/wl128x-fw-5-plt.bin \ + $(PKG_BUILD_DIR)/ti-connectivity/wl128x-fw-5-sr.bin \ + $(PKG_BUILD_DIR)/ti-connectivity/wl128x-nvs.bin \ + $(1)/lib/firmware/ti-connectivity +endef +$(eval $(call BuildPackage,wl12xx-firmware)) + +Package/wl18xx-firmware = $(call Package/firmware-default,TI WL18xx firmware) +define Package/wl18xx-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/ti-connectivity + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/ti-connectivity/wl18xx-fw-4.bin \ + $(1)/lib/firmware/ti-connectivity +endef +$(eval $(call BuildPackage,wl18xx-firmware)) + Modified: trunk/package/kernel/mac80211/Makefile =================================================================== --- trunk/package/kernel/mac80211/Makefile 2016-01-10 16:36:31 UTC (rev 48180) +++ trunk/package/kernel/mac80211/Makefile 2016-01-10 16:36:40 UTC (rev 48181) @@ -1441,7 +1441,7 @@ $(call KernelPackage/mac80211/Default) TITLE:=Driver for TI WL12xx URL:=http://wireless.kernel.org/en/users/Drivers/wl12xx - DEPENDS+= +kmod-wlcore + DEPENDS+= +kmod-wlcore +wl12xx-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ti/wl12xx/wl12xx.ko AUTOLOAD:=$(call AutoProbe,wl12xx) endef @@ -1454,7 +1454,7 @@ $(call KernelPackage/mac80211/Default) TITLE:=Driver for TI WL18xx URL:=http://wireless.kernel.org/en/users/Drivers/wl18xx - DEPENDS+= +kmod-wlcore + DEPENDS+= +kmod-wlcore +wl18xx-firmware FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ti/wl18xx/wl18xx.ko AUTOLOAD:=$(call AutoProbe,wl18xx) endef @@ -1841,27 +1841,6 @@ $(INSTALL_DATA) $(DL_DIR)/$(P54SPIFW) $(1)/lib/firmware/3826.arm endef -define KernelPackage/wl12xx/install - $(INSTALL_DIR) $(1)/lib/firmware/ti-connectivity - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl127x-fw-5-mr.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl127x-fw-5-plt.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl127x-fw-5-sr.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl1271-nvs.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl128x-fw-5-mr.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl128x-fw-5-plt.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl128x-fw-5-sr.bin \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl128x-nvs.bin \ - $(1)/lib/firmware/ti-connectivity -endef - -define KernelPackage/wl18xx/install - $(INSTALL_DIR) $(1)/lib/firmware/ti-connectivity - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ti-connectivity/wl18xx-fw-4.bin \ - $(1)/lib/firmware/ti-connectivity -endef - define KernelPackage/zd1211rw/install $(INSTALL_DIR) $(1)/lib/firmware/zd1211 $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
