ath10k: remove API v2 firmware, it is no longer needed

[librecmc/librecmc.git] / package / kernel / mac80211 / Makefile

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index fa253f43cdd89665073e125edb6d966a1d25276b..f332cbd6286b45f28231f8505bea98fb087229ca 100644 (file)
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -28,7 +28,7 @@ PKG_DRIVERS = \
        b43 b43legacy \
        carl9170 \
        hermes hermes-pci hermes-pcmcia hermes-plx\
-       iwl-legacy iwl3945 iwl4965 iwlagn \
+       iwl-legacy iwl3945 iwl4965 iwlwifi \
        lib80211 \
        libipw ipw2100 ipw2200 \
        libertas-sdio libertas-usb \
@@ -270,19 +270,6 @@ Atheros IEEE 802.11ac family of chipsets. For now only
 PCI is supported.
 endef
 
-define KernelPackage/ath10k/config
-  if PACKAGE_kmod-ath10k
-
-       config ATH10K_API2_FW
-               bool "Use old AP mode firmware release (v10.1 / API v2)"
-               default n
-               help
-                 Use the ath10k firmware from the 10.1 SDK using API v2 optimized
-                 for access point operation if the default firmware keeps crashing.
-
-  endif
-endef
-
 PKG_ATH10K_LINUX_FIRMWARE_NAME:=ath10k-firmware
 PKG_ATH10K_LINUX_FIRMWARE_VERSION:=b46f3e01a6c1f9150fb4612ef53611d714565842
 PKG_ATH10K_LINUX_FIRMWARE_SOURCE:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION).tar.bz2
@@ -795,7 +782,7 @@ endef
 define KernelPackage/hermes
   $(call KernelPackage/mac80211/Default)
   TITLE:=Hermes 802.11b chipset support
-  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT +kmod-crypto-michael-mic
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco.ko
   AUTOLOAD:=$(call AutoProbe,orinoco)
 endef
@@ -841,7 +828,7 @@ define KernelPackage/hermes-pcmcia/description
 endef
 
 
-define KernelPackage/iwlagn
+define KernelPackage/iwlwifi
   $(call KernelPackage/mac80211/Default)
   DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT
   TITLE:=Intel AGN Wireless support
@@ -853,8 +840,8 @@ define KernelPackage/iwlagn
   MENU:=1
 endef
 
-define KernelPackage/iwlagn/description
- iwlagn kernel module for
+define KernelPackage/iwlwifi/description
+ iwlwifi kernel module for
  Intel Wireless WiFi Link 6250AGN Adapter
  Intel 6000 Series Wi-Fi Adapters (6200AGN and 6300AGN)
  Intel WiFi Link 1000BGN
@@ -872,11 +859,11 @@ define KernelPackage/iwlagn/description
  Intel 3165 Wi-Fi Adapter
 endef
 
-define KernelPackage/iwlagn/config
-  if PACKAGE_kmod-iwlagn
+define KernelPackage/iwlwifi/config
+  if PACKAGE_kmod-iwlwifi
 
        config PACKAGE_IWLWIFI_DEBUG
-               bool "Enable full debugging output in the iwlagn driver"
+               bool "Enable full debugging output in the iwlwifi driver"
                default n
                help
                  This option will enable debug tracing output for the iwlwifi drivers
@@ -1725,7 +1712,7 @@ config-y += RT2800USB_RT33XX RT2800USB_RT35XX RT2800USB_RT3573 RT2800USB_RT53XX
 config-$(call config_package,iwl-legacy) += IWLEGACY
 config-$(call config_package,iwl3945) += IWL3945
 config-$(call config_package,iwl4965) += IWL4965
-config-$(call config_package,iwlagn) += IWLWIFI IWLDVM IWLMVM
+config-$(call config_package,iwlwifi) += IWLWIFI IWLDVM IWLMVM
 config-$(CONFIG_PACKAGE_IWLWIFI_DEBUG)+= IWLWIFI_DEBUG
 config-$(CONFIG_PACKAGE_IWLWIFI_DEBUGFS)+= IWLWIFI_DEBUGFS
 
@@ -1867,15 +1854,9 @@ define KernelPackage/ath10k/install
        $(INSTALL_DATA) \
                $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/ath10k/QCA988X/hw2.0/board.bin \
                $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
-ifeq ($(CONFIG_ATH10K_API2_FW),y)
-       $(INSTALL_DATA) \
-               $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.1/firmware-2.bin_10.1.467.2-1 \
-               $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
-else
        $(INSTALL_DATA) \
                $(PKG_BUILD_DIR)/$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)/10.2.4/untested/firmware-5.bin_10.2.4.70-2 \
                $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
-endif
 endef
 
 define KernelPackage/b43/install
@@ -1959,7 +1940,7 @@ define KernelPackage/ipw2200/install
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware
 endef
 
-define KernelPackage/iwlagn/install
+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
@@ -2154,7 +2135,7 @@ $(eval $(call KernelPackage,hermes))
 $(eval $(call KernelPackage,hermes-pci))
 $(eval $(call KernelPackage,hermes-plx))
 $(eval $(call KernelPackage,hermes-pcmcia))
-$(eval $(call KernelPackage,iwlagn))
+$(eval $(call KernelPackage,iwlwifi))
 $(eval $(call KernelPackage,iwl-legacy))
 $(eval $(call KernelPackage,iwl4965))
 $(eval $(call KernelPackage,iwl3945))