From: Felix Fietkau Date: Sun, 10 Jan 2016 16:36:08 +0000 (+0000) Subject: mac80211: move intel firmware to the linux-firmware package X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35baa05d804568923542b3261d705f162e1af729;p=librecmc%2Flibrecmc.git mac80211: move intel firmware to the linux-firmware package Signed-off-by: Felix Fietkau SVN-Revision: 48177 --- diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 54af527cd9..d268979d44 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -34,15 +34,6 @@ define Build/Compile endef -Package/ibt-firmware = $(call Package/firmware-default,Intel bluetooth firmware) -define Package/ibt-firmware/install - $(INSTALL_DIR) $(1)/lib/firmware/intel - $(CP) \ - $(PKG_BUILD_DIR)/intel/*.bseq \ - $(1)/lib/firmware/intel -endef -$(eval $(call BuildPackage,ibt-firmware)) - Package/ar3k-firmware = $(call Package/firmware-default,ath3k firmware) define Package/ar3k-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/ar3k diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk new file mode 100644 index 0000000000..f5adfaf86c --- /dev/null +++ b/package/firmware/linux-firmware/intel.mk @@ -0,0 +1,192 @@ +Package/ibt-firmware = $(call Package/firmware-default,Intel bluetooth firmware) +define Package/ibt-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/intel + $(CP) \ + $(PKG_BUILD_DIR)/intel/*.bseq \ + $(1)/lib/firmware/intel +endef +$(eval $(call BuildPackage,ibt-firmware)) + +Package/iwl3945-firmware = $(call Package/firmware-default,Intel IWL3945 firmware) +define Package/iwl3945-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3945-2.ucode $(1)/lib/firmware +endef +$(eval $(call BuildPackage,iwl3945-firmware)) + +Package/iwl4965-firmware = $(call Package/firmware-default,Intel IWL4965 firmware) +define Package/iwl4965-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-4965-2.ucode $(1)/lib/firmware +endef +$(eval $(call BuildPackage,iwl4965-firmware)) + +Package/iwlwifi-firmware = $(call Package/firmware-default,Intel wireless firmware) +define Package/iwlwifi-firmware/config + if PACKAGE_iwlwifi-firmware + config IWL100_FW + bool "Intel 100 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Wireless-N 100 + + config IWL1000_FW + bool "Intel 1000 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Wireless-N 1000 + + config IWL105_FW + bool "Intel 105 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Wireless-N 105 + + config IWL135_FW + bool "Intel 135 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Wireless-N 135 + + config IWL2000_FW + bool "Intel 2000 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Wireless-N 2200 + + config IWL2030_FW + bool "Intel 2030 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Wireless-N 2230 + + config IWL3160_FW + bool "Intel 3160 Firmware" + default y + help + Download and install firmware for: + Intel Wireless WiFi 3160 + + config IWL5000_FW + bool "Intel 5000 Firmware" + default y + help + Download and install firmware for: + Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN + + config IWL5150_FW + bool "Intel 5150 Firmware" + default y + help + Download and install firmware for: + Intel Wireless WiFi 5150AGN + + config IWL6000_FW + bool "Intel 6000 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Ultimate-N 6300 and Advanced-N 6200 + + config IWL6005_FW + bool "Intel 6005 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Advanced-N 6205 + + config IWL6030_FW + bool "Intel 6030 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Advanced-N 6230, Wireless-N 1030, Wireless-N 130 and Advanced-N 6235 + + config IWL6050_FW + bool "Intel 6050 Firmware" + default y + help + Download and install firmware for: + Intel Centrino Advanced-N + WiMAX 6250 and Wireless-N + WiMAX 6150 + + config IWL7260_FW + bool "Intel 7260 Firmware" + default y + help + Download and install firmware for: + Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260 + + config IWL7265_FW + bool "Intel 7265 Firmware" + default y + help + Download and install firmware for: + Intel Wireless 7265, 7265D, 3165 + + config IWL8000_FW + bool "Intel 8000 Series Firmware" + default y + help + Download and install firmware for: + Intel Wireless Series 8260, 4165 + endif +endef +define Package/iwlwifi-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware +ifneq ($(CONFIG_IWL100_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-100-5.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL1000_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL105_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-105-6.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL135_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-135-6.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL2000_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-2000-6.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL2030_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-2030-6.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL3160_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-3160-16.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL5000_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-5000-5.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL5150_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-5150-2.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL6000_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000-4.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL6005_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000g2a-6.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL6030_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6000g2b-6.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL6050_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL7260_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7260-16.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL7265_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7265-16.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-7265D-16.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL8000_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-8000C-16.ucode $(1)/lib/firmware +endif +endef +$(eval $(call BuildPackage,iwlwifi-firmware)) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index bf11a6dcf1..5429e75c10 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -821,7 +821,7 @@ endef define KernelPackage/iwlwifi $(call KernelPackage/mac80211/Default) - DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT + DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT +iwlwifi-firmware TITLE:=Intel AGN Wireless support FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko \ @@ -887,118 +887,6 @@ define KernelPackage/iwlwifi/config is a low-impact option that allows getting insight into the driver's state at runtime. - config IWL100_FW - bool "Intel 100 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Wireless-N 100 - - config IWL1000_FW - bool "Intel 1000 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Wireless-N 1000 - - config IWL105_FW - bool "Intel 105 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Wireless-N 105 - - config IWL135_FW - bool "Intel 135 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Wireless-N 135 - - config IWL2000_FW - bool "Intel 2000 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Wireless-N 2200 - - config IWL2030_FW - bool "Intel 2030 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Wireless-N 2230 - - config IWL3160_FW - bool "Intel 3160 Firmware" - default y - help - Download and install firmware for: - Intel Wireless WiFi 3160 - - config IWL5000_FW - bool "Intel 5000 Firmware" - default y - help - Download and install firmware for: - Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN - - config IWL5150_FW - bool "Intel 5150 Firmware" - default y - help - Download and install firmware for: - Intel Wireless WiFi 5150AGN - - config IWL6000_FW - bool "Intel 6000 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Ultimate-N 6300 and Advanced-N 6200 - - config IWL6005_FW - bool "Intel 6005 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Advanced-N 6205 - - config IWL6030_FW - bool "Intel 6030 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Advanced-N 6230, Wireless-N 1030, Wireless-N 130 and Advanced-N 6235 - - config IWL6050_FW - bool "Intel 6050 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Advanced-N + WiMAX 6250 and Wireless-N + WiMAX 6150 - - config IWL7260_FW - bool "Intel 7260 Firmware" - default y - help - Download and install firmware for: - Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260 - - config IWL7265_FW - bool "Intel 7265 Firmware" - default y - help - Download and install firmware for: - Intel Wireless 7265, 7265D, 3165 - - config IWL8000_FW - bool "Intel 8000 Series Firmware" - default y - help - Download and install firmware for: - Intel Wireless Series 8260, 4165 - endif endef @@ -1016,7 +904,7 @@ endef define KernelPackage/iwl3945 $(call KernelPackage/mac80211/Default) - DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy + DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy +iwl3945-firmware TITLE:=Intel iwl3945 Wireless support FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlegacy/iwl3945.ko AUTOLOAD:=$(call AutoProbe,iwl3945) @@ -1028,7 +916,7 @@ endef define KernelPackage/iwl4965 $(call KernelPackage/mac80211/Default) - DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy +@DRIVER_11N_SUPPORT + DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy +@DRIVER_11N_SUPPORT +iwl4965-firmware TITLE:=Intel iwl4965 Wireless support FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlegacy/iwl4965.ko AUTOLOAD:=$(call AutoProbe,iwl4965) @@ -1951,69 +1839,6 @@ define KernelPackage/ipw2200/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware endef -define KernelPackage/iwlwifi/install - $(INSTALL_DIR) $(1)/lib/firmware -ifneq ($(CONFIG_IWL100_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL1000_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL105_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-105-6.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL135_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-135-6.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL2000_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-2000-6.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL2030_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-2030-6.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL3160_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3160-16.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL5000_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5000-5.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL5150_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5150-2.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL6000_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000-4.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL6005_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2a-6.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL6030_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2b-6.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL6050_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL7260_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7260-16.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL7265_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7265-16.ucode $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7265D-16.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL8000_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-8000C-16.ucode $(1)/lib/firmware -endif -endef - -define KernelPackage/iwl3945/install - $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3945-2.ucode $(1)/lib/firmware -endef - -define KernelPackage/iwl4965/install - $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-4965-2.ucode $(1)/lib/firmware -endef - define KernelPackage/libertas-usb/install $(INSTALL_DIR) $(1)/lib/firmware/libertas $(INSTALL_DATA) \