From patchwork Fri Apr 15 18:11:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 611100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3qmlwt2tyGz9t6S for ; Sat, 16 Apr 2016 04:11:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zacarias.com.ar header.i=@zacarias.com.ar header.b=wDof+gKY; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8B1BB96442; Fri, 15 Apr 2016 18:11:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V9KnF3Hd+NUm; Fri, 15 Apr 2016 18:11:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1C1609642F; Fri, 15 Apr 2016 18:11:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 284BD1C116E for ; Fri, 15 Apr 2016 18:11:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 23B3291DF7 for ; Fri, 15 Apr 2016 18:11:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CS5ul3DsN9mX for ; Fri, 15 Apr 2016 18:11:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9B97A91DF5 for ; Fri, 15 Apr 2016 18:11:37 +0000 (UTC) Received: from asgard (cpe-186-22-138-122.telecentro-reversos.com.ar [186.22.138.122] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.1/8.15.1) with ESMTPSA id u3FIBUeJ001784 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 15 Apr 2016 18:11:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1460743894; bh=0JdyQd8d462EFw/CiBIvRX4QFKC1GIIlufanWkBa+ko=; h=From:To:Cc:Subject:Date; b=wDof+gKYWbhDCqGDt6b6+9Vkx7zwxcVFCSHuhTSN37KOs1strSNNyTxJkC9RdFF+4 aoGVC29WD3pe8/f8tsyliMUJ/Y9f2CITFFVv7yyjSQ7y722u3JY91kYX3FOGHnFQYg 5Cwv8v7rEPBsGOLaqryanOiOWQpzaJeMYM1pwUYs= Received: by asgard (sSMTP sendmail emulation); Fri, 15 Apr 2016 15:11:28 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Fri, 15 Apr 2016 15:11:27 -0300 Message-Id: <1460743888-19967-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.7.3 X-Virus-Scanned: clamav-milter 0.98.7 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH 1/2] linux-firmware: drop revision handling for iwlwifi X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" It's problematic since newer kernel versions for different chipsets (3168, 7260, 7265) aren't version tied. See: http://lxr.free-electrons.com/source/drivers/net/wireless/intel/iwlwifi/iwl-7000.c?v=4.5#L69 For 3168 the abs minimum is v20, normal minimum v20, and maximum v20. For 7260 the abs minimum is v13, normal minimum v13, and maximum v17. For 7265 the abs minimum is v13, normal minimum v13, and maximum v17. And for the upcoming 7265D abs min v13, normal min v13 and max v20, with minimum available version being v10 for previous (<4.5) kernels. This gives an impossible to satisfy logical combination with one revision knob for all 3 chipsets, and adding more knobs will add a lot of complexity. Users can purge unwanted versions from a post processing script if the space is too constrained. Signed-off-by: Gustavo Zacarias --- package/linux-firmware/Config.in | 41 -------------------------------- package/linux-firmware/linux-firmware.mk | 9 ++++--- 2 files changed, 6 insertions(+), 44 deletions(-) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 97d64ca..5a94a3c 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -70,7 +70,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 bool "Intel iwlwifi 3160" - select BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV help Firmware files for the Intel Wifi 3160 devices supported by the iwlwifi kernel driver. @@ -89,56 +88,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260 bool "Intel iwlwifi 7260" - select BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV help Firmware files for the Intel Wifi 7260 devices supported by the iwlwifi kernel driver. config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265 bool "Intel iwlwifi 7265" - select BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV help Firmware files for the Intel Wifi 7265 devices supported by the iwlwifi kernel driver. -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV - bool - -if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV - -choice - bool "iwlwifi 3160/726x revision to use" - help - Use revision 7 for kernel 3.10 to 3.12. - Use revision 8 for kernel 3.13 to 3.15. - Use revision 9 for kernel 3.16 onward. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7 - prompt "revision 7" - depends on !BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265 - help - Use revision 7 for kernel 3.10 to 3.12. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8 - prompt "revision 8" - help - Use revision 8 for kernel 3.13 to 3.15. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_9 - prompt "revision 9" - help - Use revision 9 for kernel 3.16 onward. - -endchoice - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV - int - default 7 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7 - default 8 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8 - default 9 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_9 - -endif # iwlwifi 3160/7260 - config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8 bool "Libertas SD 8686 v8" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 28fe66c..acdeea9 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -229,7 +229,8 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y) -LINUX_FIRMWARE_FILES += iwlwifi-3160-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV).ucode +LINUX_FIRMWARE_FILES += \ + $(foreach version,7 8 9 10 12 13 16,iwlwifi-3160-$(version).ucode) LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif @@ -248,12 +249,14 @@ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260),y) -LINUX_FIRMWARE_FILES += iwlwifi-7260-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV).ucode +LINUX_FIRMWARE_FILES += \ + $(foreach version,7 8 9 10 12 13 16,iwlwifi-7260-$(version).ucode) LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265),y) -LINUX_FIRMWARE_FILES += iwlwifi-7265-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV).ucode +LINUX_FIRMWARE_FILES += \ + $(foreach version,8 9 10 12 13 16,iwlwifi-7265-$(version).ucode) LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif