From patchwork Sun Aug 23 10:56:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 509816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3DC4D1402B7 for ; Sun, 23 Aug 2015 21:00:15 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id ACA3D28BFC7; Sun, 23 Aug 2015 12:57:51 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id ACB8928BF8C for ; Sun, 23 Aug 2015 12:57:18 +0200 (CEST) X-policyd-weight: using cached result; rate:hard: -8.5 Received: from mout.web.de (mout.web.de [212.227.15.4]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 23 Aug 2015 12:57:17 +0200 (CEST) Received: from tenchi-htpc.lan ([91.64.206.38]) by smtp.web.de (mrweb003) with ESMTPSA (Nemesis) id 0Lpw63-1Yr7HR1SXn-00fiA5 for ; Sun, 23 Aug 2015 12:58:02 +0200 From: Dirk Neukirchen To: openwrt-devel@lists.openwrt.org Date: Sun, 23 Aug 2015 12:56:28 +0200 Message-Id: <1440327391-25355-5-git-send-email-dirkneukirchen@web.de> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1440327391-25355-1-git-send-email-dirkneukirchen@web.de> References: <1440327391-25355-1-git-send-email-dirkneukirchen@web.de> X-Provags-ID: V03:K0:CXMZ0F+ZuODftawHqViJvNLOskHfzLdI3kbpWw0X3I5UxfJFv3q kdsEEBYf7fESfsmnMeyArfC+K6xwUg/0wPSUMIR4TU7SjtuCQaTPC+PfdnLPz8SLCGrN/bN +F9DigE4Z2/0nof8JXF9Hg+jerFMU+rCesDUx2/rhmXY+W1h0RqaNgNnRCnmz7CXIAslqQJ +hXFcLeX2ujGaqMiCqLpg== X-UI-Out-Filterresults: notjunk:1; V01:K0:tOZ55qxP1CE=:D+EXTOQXnsQ5E8TAT4i0QF iBkesmoEo6PdalvDCKRK0muOdrsnWVNMu1HdLQeOaqLkGNZJRTJpz7ktqy3TysQUf6D3B5wC/ r4dZHm138pajurfJOXpFm9pK9KSZ9p9hpl41OJFoLpKclJ3jdYbQ4WciOVaHPwc/Do2vltDMD rsmDIGJYILuNs8OmucSOUZWvsBILgh62/TKNwIhTprpRvuZhnoSyokmrC6z/y6970n+ggpnV5 2lhwduB8fmvS5XEazN9aGl08MbVzCKjdzbTyTft+CaVSe6wdgx2qgTvNPiqHuLC4dKjgf5ms1 91eAN78kMQJ28qpSIZ5An1ssVgpUjXyk0FNeH3ukHqcMc+TterV4B63c37+K794kLMOnxtpkU kyIVT9pZoevGGMXj4R2GpgO6AKKIHTgL/KfPIh5tYFPtqnsHlNSBQwMXVsIoszHKMGsv2xnk5 FK7W8Z6JZmtJg1Bw0n008G3Zdd+Ps7kKLpw4VxZksXTWjxVQmkbg08eva3ToxGNLXhtLMXdH6 +AGCOLcjP40a3IJ4TEWC3vzjmyMcm/MS3yAoDnJKZ8JJf2LllZtbp3hTmYEN+shHlmHqhSYx5 PvFOjVRihDsyQOdGo8bF/uVBy3GUd7Jvp8Q0slwlV2z2mwF+EfN9xjPsgzWBhIo5VmkHVR8pY Xd5NSUP/nOd6+MljNHcHNPE4BzQab1HkDyg/Nqz6AX3kZbUxjZp5vmU8C3wjbdJumqTmoceHC ru+Ve12oQQSoM+6b Subject: [OpenWrt-Devel] [PATCH 4/7] mac80211: refresh Intel firmware X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" - sort firmware - add newer firmware for Intel chipsets - newer Intel MVM require firmware - ucode 13 requires Kernel 4.1+ only compile tested Signed-off-by: Dirk Neukirchen --- package/kernel/mac80211/Makefile | 198 ++++++++++++++++++++++++++------------- 1 file changed, 133 insertions(+), 65 deletions(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index a3ecb5b..f2ea123 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -838,12 +838,84 @@ define KernelPackage/iwlagn endef define KernelPackage/iwlagn/description - iwlagn kernel module for Intel 5000/5150/1000/6000/6050/6005/6030/100 support + iwlagn kernel module for + Intel Wireless WiFi Link 6250AGN Adapter + Intel 6000 Series Wi-Fi Adapters (6200AGN and 6300AGN) + Intel WiFi Link 1000BGN + Intel Wireless WiFi 5150AGN + Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN + Intel 6005 Series Wi-Fi Adapters + Intel 6030 Series Wi-Fi Adapters + Intel Wireless WiFi Link 6150BGN 2 Adapter + Intel 100 Series Wi-Fi Adapters (100BGN and 130BGN) + Intel 2000 Series Wi-Fi Adapters + Intel 7260 Wi-Fi Adapter + Intel 3160 Wi-Fi Adapter + Intel 7265 Wi-Fi Adapter + Intel 8260 Wi-Fi Adapter + Intel 3165 Wi-Fi Adapter endef define KernelPackage/iwlagn/config if PACKAGE_kmod-iwlagn + 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 IWL3160_13_FW + bool "Intel 3160 Firmware ucode 13 (4.1+)" + default y + depends on LINUX_4_1 + help + Download and install firmware for: + Intel Wireless WiFi 3160 + config IWL5000_FW bool "Intel 5000 Firmware" default y @@ -858,13 +930,6 @@ define KernelPackage/iwlagn/config Download and install firmware for: Intel Wireless WiFi 5150AGN - config IWL1000_FW - bool "Intel 1000 Firmware" - default y - help - Download and install firmware for: - Intel Centrino Wireless-N 1000 - config IWL6000_FW bool "Intel 6000 Firmware" default y @@ -872,13 +937,6 @@ define KernelPackage/iwlagn/config Download and install firmware for: Intel Centrino Ultimate-N 6300 and Advanced-N 6200 - 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 IWL6005_FW bool "Intel 6005 Firmware" default y @@ -893,61 +951,58 @@ define KernelPackage/iwlagn/config Download and install firmware for: Intel Centrino Advanced-N 6230, Wireless-N 1030, Wireless-N 130 and Advanced-N 6235 - config IWL7260_FW - bool "Intel 7260 Firmware" + config IWL6050_FW + bool "Intel 6050 Firmware" default y help Download and install firmware for: - Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260 + Intel Centrino Advanced-N + WiMAX 6250 and Wireless-N + WiMAX 6150 - config IWL7265_FW - bool "Intel 7265 Firmware" + config IWL7260_FW + bool "Intel 7260 Firmware" default y help Download and install firmware for: - Intel Wireless 7265 + Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260 - config IWL100_FW - bool "Intel 100 Firmware" + config IWL7260_10_FW + bool "Intel 7260 Firmware ucode 10 (3.17+)" default y help Download and install firmware for: - Intel Centrino Wireless-N 100 + Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260 - config IWL2000_FW - bool "Intel 2000 Firmware" + config IWL7260_13_FW + bool "Intel 7260 Firmware ucode 13 (4.1+)" default y + depends on LINUX_4_1 help Download and install firmware for: - Intel Centrino Wireless-N 2200 + Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260 - config IWL2030_FW - bool "Intel 2030 Firmware" + config IWL7265_FW + bool "Intel 7265 Firmware" default y help Download and install firmware for: - Intel Centrino Wireless-N 2230 + Intel Wireless 7265 - config IWL105_FW - bool "Intel 105 Firmware" + config IWL7265_13_FW + bool "Intel 7265 Firmware ucode 13 (4.1+)" default y + depends on LINUX_4_1 help Download and install firmware for: - Intel Centrino Wireless-N 105 + Intel Wireless 7265, 7265D, 3165 - config IWL135_FW - bool "Intel 135 Firmware" + config IWL8000_FW + bool "Intel 8000 Series Firmware ucode 13 (4.1+)" default y + depends on LINUX_4_1 help Download and install firmware for: - Intel Centrino Wireless-N 135 + Intel Wireless Series 8260, 4165 - config IWL3160_FW - bool "Intel 3160 Firmware" - default y - help - Download and install firmware for: - Intel Wireless 3160 endif endef @@ -1930,50 +1985,63 @@ endef define KernelPackage/iwlagn/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-9.ucode $(1)/lib/firmware +endif +ifneq ($(CONFIG_IWL3160_13_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3160-13.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_IWL1000_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-1000-5.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_IWL6050_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6050-5.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-9.ucode $(1)/lib/firmware endif -ifneq ($(CONFIG_IWL7265_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7265-9.ucode $(1)/lib/firmware -endif -ifneq ($(CONFIG_IWL100_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.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 +ifneq ($(CONFIG_IWL7260_10_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7260-10.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 +ifneq ($(CONFIG_IWL7260_13_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7260-13.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 +ifneq ($(CONFIG_IWL7265_13_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7265-13.ucode $(1)/lib/firmware + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7265D-13.ucode $(1)/lib/firmware endif -ifneq ($(CONFIG_IWL3160_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3160-9.ucode $(1)/lib/firmware +ifneq ($(CONFIG_IWL8000_13_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-8000C-13.ucode $(1)/lib/firmware endif endef