From 76e40e33856c0b8f187aaba3f2b42a23eb62d2b8 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 30 Jun 2020 10:46:30 +0200 Subject: linux-firmware: use mrvl sdsd8997_combo_v4 from linux-firmware The firmware for Marvell 8997 using SDIO as the interface is also available from the regular linux-firmware repo, although with an other filename. Use that one and provide a symlink to cope with the old name. Signed-off-by: Max Krummenacher --- recipes-kernel/linux-firmware/files/sd8997_uapsta.bin | Bin 621896 -> 0 bytes .../linux-firmware/linux-firmware_%.bbappend | 7 ++----- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 recipes-kernel/linux-firmware/files/sd8997_uapsta.bin diff --git a/recipes-kernel/linux-firmware/files/sd8997_uapsta.bin b/recipes-kernel/linux-firmware/files/sd8997_uapsta.bin deleted file mode 100644 index b576403..0000000 Binary files a/recipes-kernel/linux-firmware/files/sd8997_uapsta.bin and /dev/null differ diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index 161e8ee..9ecfcc5 100644 --- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -3,16 +3,12 @@ LICENSE_${PN}-sd8997 = "Firmware-Marvell" FILESEXTRAPATHS_append := "${THISDIR}/files:" -SRC_URI_append += "\ - file://sd8997_uapsta.bin \ - " - PACKAGES_prepend = "\ ${PN}-rtl8188eu \ ${PN}-sd8997 \ " do_install_append() { - cp ${WORKDIR}/sd8997_uapsta.bin ${D}${nonarch_base_libdir}/firmware/mrvl/ + ln -fs sdsd8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin } FILES_${PN}-rtl8188eu = " \ @@ -20,6 +16,7 @@ FILES_${PN}-rtl8188eu = " \ " FILES_${PN}-sd8997 = " \ ${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin \ + ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin \ " RDEPENDS_${PN}-rtl8188eu += "${PN}-rtl-license" RDEPENDS_${PN}-sd8997 += "${PN}-marvell-license" -- cgit v1.2.3