Skip to contentSkip to conversation

linux-firmware: more firmwares (branch yem/lnx-fw)

PATCH New Yann E. MORIN 2 participants 7 messages Sep 21, 2014

lore
Share & tools
lore
#0 lore raw

v3 cover linux-firmware: more firmwares (branch yem/lnx-fw)

Hello All!

This series updates some of the linux-firmware files, and adds a few new ones to install.

Nothing really fancy.

Changes v2 -> v3:
- add old options to Legacy (Thomas P.)

Change v1 -> v2:
- split the Intel SST DSP and TI wl18xx patch in two patches

Regards,
Yann E. MORIN.

The following changes since commit 64982ce4fa7c5131e90ea18ef761940435d8873a:

gendoc infra: cosmetic fixes (2014-09-21 20:11:02 +0200)

are available in the git repository at:

git://gitorious.org/buildroot/buildroot.git yem/lnx-fw

for you to fetch changes up to 3cf029249f53fbbd58a50d1275872fa46111034e:

package/linux-firmware: install Xceive/Cresta xc4000 and xc5000c (2014-09-21 20:34:03 +0200)

----------------------------------------------------------------
Yann E. MORIN (5):
package/linux-firmware: prepare new firmware and new revision for iwlwifi package/linux-firmware: add new revision for iwlwifi firmware package/linux-firmware: add option for iwl7265 firmware package/linux-firmware: add option for Chelsio cxgb4 T5 package/linux-firmware: install Xceive/Cresta xc4000 and xc5000c

 Config.in.legacy                         | 39 +++++++++++++++++++++++
 package/linux-firmware/Config.in         | 53 +++++++++++++++++++++++---------
 package/linux-firmware/linux-firmware.mk | 27 ++++++++++++----
 3 files changed, 99 insertions(+), 20 deletions(-)
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH v3 1/5 package/linux-firmware: prepare new firmware and new revision for iwlwifi

There is an upcoming new firmware file for a new chipset supported by iwlwifi, as well as a new revision of the iwlwifi firmware.

The patch only prepares the iwlwifi entries so it is easier to add them.

---
Chamges v2 -> v3:
- add old options to Legacy (Thomas P.)

---
 Config.in.legacy                         | 23 +++++++++++++++++++++++
 package/linux-firmware/Config.in         | 20 ++++++++++++--------
 package/linux-firmware/linux-firmware.mk |  4 ++--
 3 files changed, 37 insertions(+), 10 deletions(-)
Config.in.legacy +23 -0
index 5b1460c..f7bde7f 100644
@@ -99,6 +99,29 @@ comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2014.11"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7
+	bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 has been renamed"
+	help
+	  The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7 was
+	  renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7. You must
+	  select it in:
+	      Target packages -> Hardware handling ->
+	      Firmware -> linux-firmware -> WiFi firmware ->
+	      iwlwifi 3160/726x revision to use (revision 7)
+
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8
+	bool "BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 has been renamed"
+	help
+	  The option BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8 was
+	  renamed to BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8. You must
+	  select it in:
+	      Target packages -> Hardware handling ->
+	      Firmware -> linux-firmware -> WiFi firmware ->
+	      iwlwifi 3160/726x revision to use (revision 8)
+
+###############################################################################
 comment "Legacy options removed in 2014.08"
 
 config BR2_PACKAGE_LIBELF
package/linux-firmware/Config.in +12 -8
index 7a1c40f..dc07a96 100644
@@ -46,6 +46,7 @@ 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.
@@ -58,35 +59,38 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000
 
 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.
 
-if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 || \
-   BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
+	bool
+
+if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_NEED_REV
 
 choice
-	bool "iwlwifi 3160/7260 revision to use"
+	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 onward.
 
-config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7
 	prompt "revision 7"
 	help
 	  Use revision 7 for kernel 3.10 to 3.12.
 
-config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8
 	prompt "revision 8"
 	help
 	  Use revision 8 for kernel 3.13 onward.
 
 endchoice
 
-config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_REV
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV
 	int
-	default 7 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_7
-	default 8 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160_7260_8
+	default 7 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7
+	default 8 if BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8
 
 endif # iwlwifi 3160/7260
 
package/linux-firmware/linux-firmware.mk +2 -2
index a7e1329..46e07d6 100644
@@ -159,7 +159,7 @@ 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_3160_7260_REV).ucode
+LINUX_FIRMWARE_FILES += iwlwifi-3160-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV).ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
 endif
 
@@ -173,7 +173,7 @@ 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_3160_7260_REV).ucode
+LINUX_FIRMWARE_FILES += iwlwifi-7260-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV).ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
 endif
 
Signature · 1 line
1.9.1
#2 lore raw

PATCH v3 2/5 package/linux-firmware: add new revision for iwlwifi firmware

In reply to Yann E. MORIN
---
 package/linux-firmware/Config.in | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
package/linux-firmware/Config.in +9 -2
index dc07a96..99f5956 100644
@@ -73,7 +73,8 @@ 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 onward.
+	  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"
@@ -83,7 +84,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_7
 config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV_8
 	prompt "revision 8"
 	help
-	  Use revision 8 for kernel 3.13 onward.
+	  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
 
@@ -91,6 +97,7 @@ 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
 
Signature · 1 line
1.9.1
#3 lore raw

PATCH v3 3/5 package/linux-firmware: add option for iwl7265 firmware

In reply to Yann E. MORIN

New firmware to support iwlwifi-7265. Only comes in rev-8 or rev-9 flavours, so hide rev-7 when iwlwifi-7265 is selected.

---
 package/linux-firmware/Config.in         | 8 ++++++++
 package/linux-firmware/linux-firmware.mk | 5 +++++
 2 files changed, 13 insertions(+)
package/linux-firmware/Config.in +8 -0
index 99f5956..00c7edb 100644
@@ -64,6 +64,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260
 	  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
 
@@ -78,6 +85,7 @@ choice
 
 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.
 
package/linux-firmware/linux-firmware.mk +5 -0
index 46e07d6..4e78c63 100644
@@ -177,6 +177,11 @@ LINUX_FIRMWARE_FILES += iwlwifi-7260-$(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_REV).u
 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_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y)
 LINUX_FIRMWARE_FILES += \
 	bnx2x/bnx2x-e1-7.10.51.0.fw \
Signature · 1 line
1.9.1
#4 lore raw

PATCH v3 4/5 package/linux-firmware: add option for Chelsio cxgb4 T5

In reply to Yann E. MORIN

---
Changes v2 -> v3:
- add old option to Legacy (Thomas P.)

---
 Config.in.legacy                         | 8 ++++++++
 package/linux-firmware/Config.in         | 8 +++++++-
 package/linux-firmware/linux-firmware.mk | 8 +++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)
Config.in.legacy +8 -0
index f7bde7f..e233e3c 100644
@@ -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
package/linux-firmware/Config.in +7 -1
index 00c7edb..9d39df8 100644
@@ -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"
package/linux-firmware/linux-firmware.mk +7 -1
index 4e78c63..bc036be 100644
@@ -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
Signature · 1 line
1.9.1
#5 lore raw

PATCH v3 5/5 package/linux-firmware: install Xceive/Cresta xc4000 and xc5000c

In reply to Yann E. MORIN

Tweak the prompt, because Xceive is now part of Cresta, so the new xc5000c-based devices might be branded under either name.

---
Changes v2 -> v3:
- add old option to Legacy (Thomas P.)

---
 Config.in.legacy                         |  8 ++++++++
 package/linux-firmware/Config.in         |  6 +++---
 package/linux-firmware/linux-firmware.mk | 10 +++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)
Config.in.legacy +8 -0
index e233e3c..6e202fe 100644
@@ -101,6 +101,14 @@ endif
 ###############################################################################
 comment "Legacy options removed in 2014.11"
 
+config BR2_PACKAGE_LINUX_FIRMWARE_XC5000
+	bool "Xceive xc5000 option has been renamed"
+	select BR2_PACKAGE_LINUX_FIRMWARE_XCx000
+	help
+	  The Xceive xc5000 option now also handles older firmwares from
+	  Xceive (the xc4000 series), as well as new firmwares (the xc5000c)
+	  from Cresta, who bought Xceive.
+
 config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4
 	bool "Chelsio T4 option has been renamed"
 	select BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4
package/linux-firmware/Config.in +3 -3
index 9d39df8..cd35dcc 100644
@@ -217,10 +217,10 @@ config BR2_PACKAGE_LINUX_FIRMWARE_H5_DRXK
 	help
 	  Firmware file for Terratec H5 DRX-K based DVB tuner driver
 
-config BR2_PACKAGE_LINUX_FIRMWARE_XC5000
-	bool "Xceive xc5000"
+config BR2_PACKAGE_LINUX_FIRMWARE_XCx000
+	bool "Xceive/Cresta xc4000/xc5000/xc500c"
 	help
-	  Firmware file for xc5000-based DVB tuner driver
+	  Firmware file for xc4000/xc5000/xc5000c based DVB tuner driver
 
 endmenu
 
package/linux-firmware/linux-firmware.mk +7 -3
index bc036be..4303985 100644
@@ -203,9 +203,13 @@ 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
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_XCx000),y)
+LINUX_FIRMWARE_FILES += dvb-fe-xc4000-1.4.1.fw \
+			dvb-fe-xc5000-1.6.114.fw \
+			dvb-fe-xc5000c-4.1.30.7.fw
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.xc4000 \
+				    LICENCE.xc5000 \
+				    LICENCE.xc5000c
 endif
 
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AS102),y)
Signature · 1 line
1.9.1
#6 lore raw

v3 cover linux-firmware: more firmwares (branch yem/lnx-fw)

In reply to Yann E. MORIN

Dear Yann E. MORIN,

Quoted 11 lines · Yann E. MORIN

Yann E. MORIN (5):
package/linux-firmware: prepare new firmware and new revision for iwlwifi package/linux-firmware: add new revision for iwlwifi firmware package/linux-firmware: add option for iwl7265 firmware package/linux-firmware: add option for Chelsio cxgb4 T5 package/linux-firmware: install Xceive/Cresta xc4000 and xc5000c

 Config.in.legacy                         | 39 +++++++++++++++++++++++
 package/linux-firmware/Config.in         | 53 +++++++++++++++++++++++---------
 package/linux-firmware/linux-firmware.mk | 27 ++++++++++++----
 3 files changed, 99 insertions(+), 20 deletions(-)

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com