aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Herbrechtsmeier <stefan@herbrechtsmeier.net>2012-04-05 12:36:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-06 01:08:23 +0100
commitbaa1323dfff35ccd5aebc036ca97925a1f1a604e (patch)
treeaf858a6e9fb4951a426396b70d2dbe4380219bb5
parentad77d367e1526a805c383ce20f8f81ef3082c3d8 (diff)
downloadopenembedded-core-contrib-baa1323dfff35ccd5aebc036ca97925a1f1a604e.tar.gz
linux-firmware: keep version string in libertas firmware
Recent Linux kernel tries to load the libertas firmware with the version string in its name first. This results in a delayed firmware load on system boot. Keep the default libertas firmware name and add a link for older driver versions. Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_git.bb10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 52929fa38b..3675978068 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -38,8 +38,8 @@ do_install() {
cp -r * ${D}/lib/firmware/
# Libertas sd8686
- install -m 0644 libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
- install -m 0644 libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
+ ln -sf libertas/sd8686_v9.bin ${D}/lib/firmware/sd8686.bin
+ ln -sf libertas/sd8686_v9_helper.bin ${D}/lib/firmware/sd8686_helper.bin
# Realtek rtl8192*
install -m 0644 LICENCE.rtlwifi_firmware.txt ${D}/lib/firmware/rtlwifi/LICENCE.rtlwifi_firmware.txt
@@ -51,7 +51,11 @@ do_install() {
PACKAGES =+ "${PN}-sd8686 ${PN}-rtl8192cu linux-firmware-rtl8192ce linux-firmware-rtl8192su ${PN}-wl12xx"
LICENSE_${PN}-sd8686 = "Firmware:LICENSE.libertas"
-FILES_${PN}-sd8686 = "/lib/firmware/sd8686* /lib/firmware/LICENCE.libertas"
+FILES_${PN}-sd8686 = " \
+ /lib/firmware/libertas/sd8686_v9* \
+ /lib/firmware/sd8686* \
+ /lib/firmware/LICENCE.libertas \
+"
LICENSE_${PN}-rtl8192cu = "Firmware:LICENCE.rtlwifi_firmware"
FILES_${PN}-rtl8192cu = " \