From dac546e976ac61a8cdc83f2c61e29b751a5151a1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 21 Sep 2014 20:38:12 +0200 Subject: [PATCH] package/linux-firmware: add option for Chelsio cxgb4 T5 Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 ++++++++ package/linux-firmware/Config.in | 8 +++++++- package/linux-firmware/linux-firmware.mk | 8 +++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index f7bde7fcd..e233e3c64 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -101,6 +101,14 @@ endif ############################################################################### comment "Legacy options removed in 2014.11" +config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 + bool "Chelsio T4 option has been renamed" + select BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 + help + The Chelsio T4 option BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 + has been renamed to BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 + to better account for the fact that a T5 variant exists. + config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 has been renamed" help diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 00c7edb80..9d39df894 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -183,10 +183,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X help Firmware files for Broadcom NetXtreme 10Gb ethernet cards (bnx2x) -config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4 +config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 bool "Chelsio T4" help Firmware files for Chelsio T4 1Gb and 10Gb ethernet cards (cxgb4) + +config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5 + bool "Chelsio T5" + help + Firmware files for Chelsio T5 1Gb and 10Gb ethernet cards (cxgb4) + endmenu menu "DVB firmware" diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 4e78c63e2..bc036be4c 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -191,12 +191,18 @@ LINUX_FIRMWARE_FILES += \ # which is installed unconditionally endif -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4),y) +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4),y) # cxgb4/t4fw.bin is a symlink to cxgb4/t4fw-1.11.27.0.bin LINUX_FIRMWARE_FILES += cxgb4/t4fw-1.11.27.0.bin cxgb4/t4fw.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5),y) +# cxgb4/t5fw.bin is a symlink to cxgb4/t5fw-1.11.27.0.bin +LINUX_FIRMWARE_FILES += cxgb4/t5fw-1.11.27.0.bin cxgb4/t5fw.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_XC5000),y) LINUX_FIRMWARE_FILES += dvb-fe-xc5000-1.6.114.fw LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.xc5000