From 1cfd60eb84bd88e0b3e02274e3acc3a4a8881ff9 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 20 Oct 2020 01:06:07 +0200 Subject: linux-firmware: package marvel sdio 8997 firmware Add package for the firmware required by the Marvell 8997 chipset when connected over SDIO. (From OE-Core rev: 37a815399aaa216b1c498dd8b82416c4df471755) Signed-off-by: Max Krummenacher Signed-off-by: Richard Purdie (cherry picked from commit d8b69d826702db9f5a3482754db8967c924a156d) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- .../linux-firmware/linux-firmware_20200817.bb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb index 5c9d4c3e04..3d6644e504 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200817.bb @@ -218,8 +218,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-mt7601u-license ${PN}-mt7601u \ ${PN}-radeon-license ${PN}-radeon \ ${PN}-marvell-license ${PN}-pcie8897 ${PN}-pcie8997 \ - ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 ${PN}-sd8887 ${PN}-sd8897 \ - ${PN}-usb8997 \ + ${PN}-sd8686 ${PN}-sd8688 ${PN}-sd8787 ${PN}-sd8797 ${PN}-sd8801 \ + ${PN}-sd8887 ${PN}-sd8897 ${PN}-sd8997 ${PN}-usb8997 \ ${PN}-ti-connectivity-license ${PN}-wlcommon ${PN}-wl12xx ${PN}-wl18xx \ ${PN}-vt6656-license ${PN}-vt6656 \ ${PN}-rtl-license ${PN}-rtl8188 ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su ${PN}-rtl8723 ${PN}-rtl8821 \ @@ -404,6 +404,7 @@ LICENSE_${PN}-sd8797 = "Firmware-Marvell" LICENSE_${PN}-sd8801 = "Firmware-Marvell" LICENSE_${PN}-sd8887 = "Firmware-Marvell" LICENSE_${PN}-sd8897 = "Firmware-Marvell" +LICENSE_${PN}-sd8997 = "Firmware-Marvell" LICENSE_${PN}-usb8997 = "Firmware-Marvell" LICENSE_${PN}-marvell-license = "Firmware-Marvell" @@ -439,6 +440,15 @@ FILES_${PN}-sd8887 = " \ FILES_${PN}-sd8897 = " \ ${nonarch_base_libdir}/firmware/mrvl/sd8897_uapsta.bin \ " +do_install_append() { + # The kernel 5.6.x driver still uses the old name, provide a symlink for + # older kernels + ln -fs sdsd8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin +} +FILES_${PN}-sd8997 = " \ + ${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin \ + ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin \ +" FILES_${PN}-usb8997 = " \ ${nonarch_base_libdir}/firmware/mrvl/usbusb8997_combo_v4.bin \ " @@ -450,6 +460,7 @@ RDEPENDS_${PN}-sd8797 += "${PN}-marvell-license" RDEPENDS_${PN}-sd8801 += "${PN}-marvell-license" RDEPENDS_${PN}-sd8887 += "${PN}-marvell-license" RDEPENDS_${PN}-sd8897 += "${PN}-marvell-license" +RDEPENDS_${PN}-sd8997 += "${PN}-marvell-license" RDEPENDS_${PN}-usb8997 += "${PN}-marvell-license" # For netronome -- cgit v1.2.3-54-g00ecf