From 05f21adb99f97140e874fa2a4ed66d5e3554cd33 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 20 Jul 2018 22:28:15 +0000 Subject: [PATCH] linux-firmware: remove duplicate ${PN}-bcm43455 package Signed-off-by: Martin Jansa --- recipes-kernel/linux-firmware/linux-firmware_%.bbappend | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index 8deac40..c0f9e17 100644 --- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -31,11 +31,18 @@ do_install_append_rpi() { # NB: Must prepend, else these become empty and their content is left in # the roll-up package which precedes them. PACKAGES_prepend_rpi = "\ - ${PN}-bcm43455 \ ${PN}-bcm43430a1-hcd \ ${PN}-bcm4345c0-hcd \ " +# ${PN}-bcm43455 package and brcmfmac43455-sdio from linux-firmware +# is already included in the oe-core recipe, so don't add it to PACKAGES +# again, the version from raspbian-nf seems a bit newer: +# $ strings ./1_0.0+gitAUTOINC+d114732723+86e88fbf03+e28cd7ee86-r0/git/brcm/brcmfmac43455-sdio.bin | grep Ver +# Version: 7.45.18.0 CRC: d7226371 Date: Sun 2015-03-01 07:31:57 PST Ucode Ver: 1026.2 FWID: 01-6a2c8ad4 +# $ strings ./1_0.0+gitAUTOINC+d114732723+86e88fbf03+e28cd7ee86-r0/raspbian-nf/brcm/brcmfmac43455-sdio.bin | grep Ver +# Version: 7.45.154 (r684107 CY) CRC: b1f79383 Date: Tue 2018-02-27 03:18:17 PST Ucode Ver: 1043.2105 FWID 01-4fbe0b04 + # For additional Broadcom LICENSE_${PN}-bcm43455 = "Firmware-broadcom_bcm43xx"