Skip to contentSkip to conversation

Misc linux-firmware fixes (branch yem/lnxfw)

PATCH New Yann E. MORIN 2 participants 4 messages Apr 21, 2014

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

cover Misc linux-firmware fixes (branch yem/lnxfw)

From: "Yann E. MORIN" <[email protected]>

Hello All!

Here are a few fixes to the linux-firmware package:
- fix a typo in a variable name
- install missing symlink-target files

Regards,
Yann E. MORIN.

The following changes since commit 8104fd72ed6fee97f024ec75a4ed81231e2777b8:

mysql: disable maintainer mode (2014-04-21 14:48:23 +0200)

are available in the git repository at:

git://gitorious.org/buildroot/buildroot.git yem/lnxfw

for you to fetch changes up to dc9af8ce0711ae9a66c28327546aeb999f08cca4:

package/linux-firmware: install missing symlink-target files (2014-04-21 20:20:58 +0200)

----------------------------------------------------------------
Yann E. MORIN (2):
package/linux-firmware: fix typo in variable name package/linux-firmware: install missing symlink-target files

 package/linux-firmware/linux-firmware.mk | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 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.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH 1/2 package/linux-firmware: fix typo in variable name

From: "Yann E. MORIN" <[email protected]>

Remove a trailing _ leftover from: c0d82bd3 (package/linux-firmware: install license files with 'make legal-info')

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/linux-firmware/linux-firmware.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/linux-firmware/linux-firmware.mk +1 -1
index df6c36b..135b29b 100644
@@ -10,7 +10,7 @@ LINUX_FIRMWARE_SITE_METHOD = git
 
 # rt2501/rt61
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y)
-LINUX_FIRMWARE_FILES_ += rt2561.bin rt2561s.bin rt2661.bin
+LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink-firmware.txt
 endif
Signature · 1 line
1.8.3.2
author
#2 lore raw

PATCH 2/2 package/linux-firmware: install missing symlink-target files

In reply to Yann E. MORIN

From: "Yann E. MORIN" <[email protected]>

AS reported by ovf on IRC, some of the firmwares we install are in fact symlinks to some other files.

Install those files as well, and document the existing symlinks.

Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/linux-firmware/linux-firmware.mk | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
package/linux-firmware/linux-firmware.mk +10 -4
index 135b29b..9c7e05c 100644
@@ -22,6 +22,8 @@ endif
 
 # rt2xx
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX),y)
+# rt3090.bin is a symlink to rt2860.bin
+# rt3070.bin is a symlink to rt2870.bin
 LINUX_FIRMWARE_FILES += rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink-firmware.txt
 endif

@@ -77,6 +79,8 @@ endif
 # sd8688
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688),y)
 LINUX_FIRMWARE_FILES += libertas/sd8688.bin libertas/sd8688_helper.bin
+# The two files above are but symlinks to those two ones:
+LINUX_FIRMWARE_FILES += mrvl/sd8688.bin mrvl/sd8688_helper.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell
 endif
 

@@ -88,6 +92,7 @@ endif
 
 # wl127x
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y)
+# wl1271-nvs.bin is a symlink to wl127x-nvs.bin
 LINUX_FIRMWARE_FILES += \
 	ti-connectivity/wl1271-fw-2.bin				\
 	ti-connectivity/wl1271-fw-ap.bin			\

@@ -123,6 +128,8 @@ LINUX_FIRMWARE_FILES += \
 	ti-connectivity/wl128x-fw-5-plt.bin			\
 	ti-connectivity/wl128x-fw-5-sr.bin			\
 	ti-connectivity/TIInit_7.2.31.bts
+# wl12xx-nvs.bin (above) is a symlink to:
+LINUX_FIRMWARE_FILES += ti-connectivity/wl127x-nvs.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
 

@@ -155,9 +162,8 @@ LINUX_FIRMWARE_FILES += \
 endif
 
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4),y)
-LINUX_FIRMWARE_FILES += \
-	cxgb4/t4fw-1.9.23.0.bin \
-	cxgb4/t4fw.bin
+# cxgb4/t4fw.bin is a symlink to cxgb4/t4fw-1.9.23.0.bin
+LINUX_FIRMWARE_FILES += cxgb4/t4fw-1.9.23.0.bin cxgb4/t4fw.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware
 endif
 

@@ -201,7 +207,7 @@ LINUX_FIRMWARE_LICENSE_FILES = $(sort $(LINUX_FIRMWARE_ALL_LICENSE_FILES))
 
 define LINUX_FIRMWARE_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/lib/firmware
-	$(TAR) c -C $(@D) $(LINUX_FIRMWARE_FILES) | \
+	$(TAR) c -C $(@D) $(sort $(LINUX_FIRMWARE_FILES)) | \
 		$(TAR) x -C $(TARGET_DIR)/lib/firmware
 endef
Signature · 1 line
1.8.3.2
#3 lore raw

cover Misc linux-firmware fixes (branch yem/lnxfw)

In reply to Yann E. MORIN

Dear Yann E. MORIN,

Quoted 3 lines · Yann E. MORIN

Yann E. MORIN (2):
package/linux-firmware: fix typo in variable name package/linux-firmware: install missing symlink-target files

Both applied, thanks.

Thomas

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