From patchwork Fri Feb 26 04:31:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 588615 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 08997140326 for ; Fri, 26 Feb 2016 15:39:43 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=jms.id.au header.i=@jms.id.au header.b=FtmXZF+K; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 69E8C95DE9; Fri, 26 Feb 2016 04:39:42 +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 OoONPK7lirdA; Fri, 26 Feb 2016 04:39:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C6C3E95DE4; Fri, 26 Feb 2016 04:39:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E46E11C0FD0 for ; Fri, 26 Feb 2016 04:39:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DDEE495DE4 for ; Fri, 26 Feb 2016 04:39:39 +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 1UVd2OnVYsFt for ; Fri, 26 Feb 2016 04:39:39 +0000 (UTC) X-Greylist: delayed 00:07:54 by SQLgrey-1.7.6 Received: from mail-pf0-f179.google.com (mail-pf0-f179.google.com [209.85.192.179]) by hemlock.osuosl.org (Postfix) with ESMTPS id 23B6495DE3 for ; Fri, 26 Feb 2016 04:39:39 +0000 (UTC) Received: by mail-pf0-f179.google.com with SMTP id c10so46619273pfc.2 for ; Thu, 25 Feb 2016 20:39:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jms.id.au; s=google; h=from:to:subject:date:message-id; bh=nBt43sQ844nySygcC0hiQlL/LwQVdVEboZl++vB/AA8=; b=FtmXZF+KdHhNVaNG/XKrOmoXj9amg9L296ykgltCyF5GjvqD1KkswTtslDef7iwPOx csWPtXupfsks1CQoYEq1635lMKbMxCDZi4wLJPvM6WU1SmU3owyZhS8yHvztYWVqIp4Q 89M7CVw/0FgNnOMUT98LFAtRjWLh7qMlqzv/I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=nBt43sQ844nySygcC0hiQlL/LwQVdVEboZl++vB/AA8=; b=GNbWWYcSmtoCstxZpXO9ktezVFZI7MCluB/XiVLJzzED5gEmohoFh27rBpQMba6Mw+ AnlOWCPGTfs3kO4Y/+xQzhGYotmEQ3/isiBthQ7s5jOIU/iDRX3gYvR9UAt5d+VLUH1e /engULiy8xQZiPgFCNEcdMpOc7LVFywmekMlbeijOeZCW9BYe5kvKHwo586SYPRyi37V B6HQNNOQPFyDSDLqRpA7pjLwfmFVwCWn+GtnhPUFT3z9lNpSTNMrxcEMlxgwSOSu48yV BQR5kx9N1sVut2cxTOhU+WuIqVT5du6LlUJcmfY7BTx8ww8nVBMPrBfTuP7YyEU5Rmla WZaA== X-Gm-Message-State: AG10YOR1CnWCpHvf3uozCR4qgiSe0jlLSEtB4c6Yhu4Ax+XKTXDcp+acMW8a2GeMpnMkhw== X-Received: by 10.98.80.150 with SMTP id g22mr68572242pfj.132.1456461105214; Thu, 25 Feb 2016 20:31:45 -0800 (PST) Received: from icarus.au.ibm.com ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id s21sm15493760pfi.29.2016.02.25.20.31.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Feb 2016 20:31:44 -0800 (PST) From: Joel Stanley To: buildroot@buildroot.org Date: Fri, 26 Feb 2016 15:01:33 +1030 Message-Id: <1456461093-10202-1-git-send-email-joel@jms.id.au> X-Mailer: git-send-email 2.7.0 Subject: [Buildroot] [PATCH] linux-firmware: Allow selection of bnx2x fw version 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" Linux kernel 4.2 moved the driver to a newer firmware version. Instead of hard coding for 4.2+'s behaviour, introduce a selection mechanism where the user specifies which version to use based on the kernel they have. Signed-off-by: Joel Stanley --- package/linux-firmware/Config.in | 22 ++++++++++++++++++++++ package/linux-firmware/linux-firmware.mk | 11 ++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index d8389864adaa..b28064b9e45c 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -243,6 +243,28 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X help Firmware files for Broadcom NetXtreme 10Gb ethernet cards (bnx2x) +if BR2_PACKAGE_LINUX_FIRMWARE_BNX2X + +choice + bool "Broadcom bnx2x revision to use" + help + Use revision 7.12.30.0 for kernel 4.2 onward. + Use revision 7.10.51.0 for kernel 3.16 to 4.1. + +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X_REV_7_12_30_0 + prompt "revision 7.12.30.0" + help + Use revision 7.12.30.0 for kernel 4.2 onwards. + +config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X_REV_7_10_51_0 + prompt "revision 7.10.51.0" + help + Use revision 7.10.51.0 for kernel 3.16 to 4.1. + +endchoice + +endif + config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 bool "Chelsio T4" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 083a381ea00a..a73cbf9d6209 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -251,7 +251,7 @@ LINUX_FIRMWARE_FILES += iwlwifi-7265-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV).u LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware endif -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X_REV_7_10_51_0),y) LINUX_FIRMWARE_FILES += \ bnx2x/bnx2x-e1-7.10.51.0.fw \ bnx2x/bnx2x-e1h-7.10.51.0.fw \ @@ -260,6 +260,15 @@ LINUX_FIRMWARE_FILES += \ # which is installed unconditionally endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X_REV_7_12_30_0),y) +LINUX_FIRMWARE_FILES += \ + bnx2x/bnx2x-e1-7.12.30.0.fw \ + bnx2x/bnx2x-e1h-7.12.30.0.fw \ + bnx2x/bnx2x-e2-7.12.30.0.fw +# No license file; the license is in the file WHENCE +# which is installed unconditionally +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4),y) # cxgb4/t4fw.bin is a symlink to cxgb4/t4fw-1.14.4.0.bin LINUX_FIRMWARE_FILES += cxgb4/t4fw-1.14.4.0.bin cxgb4/t4fw.bin