Skip to contentSkip to conversation

linux-firmware: drop remnants of pre-2.6.37 support (TI)

PATCH New André Draszik 1 participant 2 messages Mar 6, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 linux-firmware: drop remnants of pre-2.6.37 support (TI)

Now that this recipe uses make install, we don't manually create symlinks for firmware files for older kernel in do_install(). As such, the FILES statement can be updated as well.

---
 meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 3 ---
 1 file changed, 3 deletions(-)
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +0 -3
index 6039dc9d71..798e2b5c7c 100644
@@ -512,15 +512,12 @@ LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity"
 
 FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity"
 FILES_${PN}-wlcommon = " \
-  ${nonarch_base_libdir}/firmware/TI* \
   ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \
 "
 FILES_${PN}-wl12xx = " \
-  ${nonarch_base_libdir}/firmware/wl12* \
   ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \
 "
 FILES_${PN}-wl18xx = " \
-  ${nonarch_base_libdir}/firmware/wl18* \
   ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \
 "
 
Signature · 1 line
2.23.0.rc1
#1 lore raw

PATCH 2/2 linux-firmware: TI: fix wl18xx support

wl1271-nvs.bin belongs to the wl18xx driver (and respective package created here), see kernel source.
Due to the way packages are assembled here it ends up in the wrong package, though.

Fix by placing it in the -common package as it's merely a symlink to wl127x-nvs.bin (which does belong to the wl12xx), so that both drivers have access to it.

---
 .../linux-firmware/linux-firmware_20200122.bb            | 9 +++++++++
 1 file changed, 9 insertions(+)
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb +9 -0
index 798e2b5c7c..e9fedd1602 100644
@@ -511,8 +511,17 @@ LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity"
 LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity"
 
 FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity"
+# wl18xx optionally needs wl1271-nvs.bin (which itself is a symlink to
+# wl127x-nvs.bin) - see linux/drivers/net/wireless/ti/wlcore/sdio.c
+# and drivers/net/wireless/ti/wlcore/spi.c.
+# While they're optional and actually only used to override the MAC
+# address on wl18xx, driver loading will delay (by udev timout - 60s)
+# if not there. So let's make it available always. Because it's a
+# symlink, both need to go to wlcommon.
 FILES_${PN}-wlcommon = " \
   ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \
+  ${nonarch_base_libdir}/firmware/ti-connectivity/wl127x-nvs.bin \
+  ${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin \
 "
 FILES_${PN}-wl12xx = " \
   ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \
Signature · 1 line
2.23.0.rc1