From patchwork Mon Aug 24 15:25:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 510117 X-Patchwork-Delegate: hauke@hauke-m.de 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 7EDC4140518 for ; Tue, 25 Aug 2015 01:27:27 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D8AEC284435; Mon, 24 Aug 2015 17:26:17 +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 91493283F0C for ; Mon, 24 Aug 2015 17:26:12 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mout.web.de (mout.web.de [212.227.17.11]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 24 Aug 2015 17:26:12 +0200 (CEST) Received: from tenchi-htpc.lan ([91.64.206.38]) by smtp.web.de (mrweb103) with ESMTPSA (Nemesis) id 0MRUFI-1ZIwLn14tE-00SdjT for ; Mon, 24 Aug 2015 17:27:03 +0200 From: Dirk Neukirchen To: openwrt-devel@lists.openwrt.org Date: Mon, 24 Aug 2015 17:25:36 +0200 Message-Id: <1440429936-31741-1-git-send-email-dirkneukirchen@web.de> X-Mailer: git-send-email 2.5.0 X-Provags-ID: V03:K0:89cNNe7T8KJ07gFuHsRXLSUWOflA7PcGteMY9x06JX6vYC13fqJ ROm3qo6SW5GVno/sgc3vYh/MN55XJjSSXtnkGSgtqBITd1D324qwm00hjePZ5TlG7cz3QSM uthpLmzdXM3kWUhFA1Nb4hrAY5kxFNINwmv/wSYxuqGrTpKbiJrrVOZC/zc7xmKOzDtqXnH 4B+t73axjJQN/mHuMF5Hw== X-UI-Out-Filterresults: notjunk:1; V01:K0:sC2u8OLLKBQ=:5696iy0FWNmiBDMUzSxFUk y6S2TaTQ5HHq2aVlW0gw67xoZ/SvG8sdSDhQcnqBY+9vop8LC6RJ/uRE7Tec7UWjwT5klm9jT ohg7KyNsPDqdmdJJHu9h2DZFNiPA9x5t19g9y1vduM27Kp2lD7o/+a/EuuJk5H/NHBvd9l+io 59dzWnDdCOSFKDqfxlOJP7LnWJwVR20aOqbDRtR428CZl+OY7K8L64NjQVmMNQxYRV+pQWiWb QtiBDZgf10OlYXm20YMXH2fTClm/izWr9roscaQnrblctNscCML/3V33bt5PkvreQi+Bl0q/l vqe69uNZkXKX79H+nae9hHYvpXCzLH7bj/Fr7uJNWymah2tFuXrsHvd58U0cc56MSmPQcj9V+ vm0uI0LwHiBCwf35UEP8bF0YoZf8zBumQaYIAZvuCMyjeKBAyW58al8BWSZNL9FO+ZMmQzS5h rqBal+Ty/VIBUwZ1A5S3tPhfhQVZFuQjXnU8ncrdlFoIi4qePX6wsQU3yhbD2f/j8+4euGP2n YDX9lpj7NgnB8hrk5KWbGrQVeasg2nl1E7gTWhHqJKjgGG27AJnEWCecX8EH71DaPvUOtY1jb i054tUqnIYo/y8cJ1jKlgfxzyYIsOJyHNBlukmOy0Ioz72ID4/4uBxB+pj5j9hdYCegqEZZ6A JbW5T1QhTaYi4YIv1EgbuyvuKkLpOcpQvJxJXgsi1GxTwYJSLJnxjajDDk3AHt4tc2RfiMtv8 dg0LDQEFXoSCbJ+w Subject: [OpenWrt-Devel] [PATCH 4/8 v2] 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 only compile tested Signed-off-by: Dirk Neukirchen --- v2: - remove old / always use newer firmware - remove Kernel version dependencies The Kernel version only seem to indicate the changed driver code. I couldn't find hard version checks just that after some code fixes there are firmware API bumps. thx Hauke for hinting at that package/kernel/mac80211/Makefile | 169 +++++++++++++++++++++++---------------- 1 file changed, 98 insertions(+), 71 deletions(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index a3ecb5b..75622cc 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -838,116 +838,139 @@ 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 IWL5000_FW - bool "Intel 5000 Firmware" + config IWL100_FW + bool "Intel 100 Firmware" default y help Download and install firmware for: - Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN + Intel Centrino Wireless-N 100 - config IWL5150_FW - bool "Intel 5150 Firmware" + config IWL1000_FW + bool "Intel 1000 Firmware" default y help Download and install firmware for: - Intel Wireless WiFi 5150AGN + Intel Centrino Wireless-N 1000 - config IWL1000_FW - bool "Intel 1000 Firmware" + config IWL105_FW + bool "Intel 105 Firmware" default y help Download and install firmware for: - Intel Centrino Wireless-N 1000 + Intel Centrino Wireless-N 105 - config IWL6000_FW - bool "Intel 6000 Firmware" + config IWL135_FW + bool "Intel 135 Firmware" default y help Download and install firmware for: - Intel Centrino Ultimate-N 6300 and Advanced-N 6200 + Intel Centrino Wireless-N 135 - config IWL6050_FW - bool "Intel 6050 Firmware" + config IWL2000_FW + bool "Intel 2000 Firmware" default y help Download and install firmware for: - Intel Centrino Advanced-N + WiMAX 6250 and Wireless-N + WiMAX 6150 + Intel Centrino Wireless-N 2200 - config IWL6005_FW - bool "Intel 6005 Firmware" + config IWL2030_FW + bool "Intel 2030 Firmware" default y help Download and install firmware for: - Intel Centrino Advanced-N 6205 + Intel Centrino Wireless-N 2230 - config IWL6030_FW - bool "Intel 6030 Firmware" + config IWL3160_FW + bool "Intel 3160 Firmware" default y help Download and install firmware for: - Intel Centrino Advanced-N 6230, Wireless-N 1030, Wireless-N 130 and Advanced-N 6235 + Intel Wireless WiFi 3160 - config IWL7260_FW - bool "Intel 7260 Firmware" + config IWL5000_FW + bool "Intel 5000 Firmware" default y help Download and install firmware for: - Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260 + Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN - config IWL7265_FW - bool "Intel 7265 Firmware" + config IWL5150_FW + bool "Intel 5150 Firmware" default y help Download and install firmware for: - Intel Wireless 7265 + Intel Wireless WiFi 5150AGN - config IWL100_FW - bool "Intel 100 Firmware" + config IWL6000_FW + bool "Intel 6000 Firmware" default y help Download and install firmware for: - Intel Centrino Wireless-N 100 + Intel Centrino Ultimate-N 6300 and Advanced-N 6200 - config IWL2000_FW - bool "Intel 2000 Firmware" + config IWL6005_FW + bool "Intel 6005 Firmware" default y help Download and install firmware for: - Intel Centrino Wireless-N 2200 + Intel Centrino Advanced-N 6205 - config IWL2030_FW - bool "Intel 2030 Firmware" + config IWL6030_FW + bool "Intel 6030 Firmware" default y help Download and install firmware for: - Intel Centrino Wireless-N 2230 + Intel Centrino Advanced-N 6230, Wireless-N 1030, Wireless-N 130 and Advanced-N 6235 - config IWL105_FW - bool "Intel 105 Firmware" + config IWL6050_FW + bool "Intel 6050 Firmware" default y help Download and install firmware for: - Intel Centrino Wireless-N 105 + Intel Centrino Advanced-N + WiMAX 6250 and Wireless-N + WiMAX 6150 - config IWL135_FW - bool "Intel 135 Firmware" + config IWL7260_FW + bool "Intel 7260 Firmware" default y help Download and install firmware for: - Intel Centrino Wireless-N 135 + Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260 - config IWL3160_FW - bool "Intel 3160 Firmware" + 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 3160 + Intel Wireless Series 8260, 4165 + endif endef @@ -1930,50 +1953,54 @@ 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-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 + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7260-13.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 + $(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_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 -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_IWL3160_FW),) - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3160-9.ucode $(1)/lib/firmware +ifneq ($(CONFIG_IWL8000_FW),) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-8000C-13.ucode $(1)/lib/firmware endif endef