From d5ae7d902a40f26a8c26f4c6d300226689738716 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 14 Jun 2018 09:52:03 -0700 Subject: Sumo refresh Update external subtrees to latest Yocto sumo. Change-Id: I8364f32bef079841c6e57f1c587f4b1bedf62fef Signed-off-by: Brad Bishop --- .../linux-firmware/linux-firmware_%.bbappend | 24 ++++++++-------------- .../recipes-kernel/linux/linux-raspberrypi_4.9.bb | 2 +- 2 files changed, 9 insertions(+), 17 deletions(-) (limited to 'meta-raspberrypi') diff --git a/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend index 34d2b6765..c0f9e1704 100644 --- a/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend +++ b/meta-raspberrypi/recipes-kernel/linux-firmware/linux-firmware_%.bbappend @@ -3,15 +3,6 @@ # https://github.com/RPi-Distro/firmware-nonfree # https://github.com/RPi-Distro/bluez-firmware -LICENSE_append_rpi = "\ - & Firmware-cypress \ -" - -LIC_FILES_CHKSUM_append_rpi = "\ - file://LICENCE.cypress;md5=cbc5f665d04f741f1e006d2096236ba7 \ -" -NO_GENERIC_LICENSE[Firmware-cypress] = "LICENCE.cypress" - SRC_URI_append_rpi = " \ git://github.com/RPi-Distro/firmware-nonfree;destsuffix=raspbian-nf;name=raspbian-nf \ git://github.com/RPi-Distro/bluez-firmware;destsuffix=raspbian-bluez;name=raspbian-bluez \ @@ -40,12 +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}-cypress-license \ ${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" @@ -58,11 +55,6 @@ FILES_${PN}-bcm43455 = " \ RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" -# For additional Cypress -FILES_${PN}-cypress-license = "\ - ${nonarch_base_libdir}/firmware/LICENCE.cypress \ -" - LICENSE_${PN}-bcm43430a1-hcd = "Firmware-cypress" LICENSE_${PN}-bcm4345c0-hcd = "Firmware-cypress" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb index 21fcfef93..b3f324829 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.9.bb @@ -2,7 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" LINUX_VERSION ?= "4.9.80" -SRCREV = "ffd7bf4085b09447e5db96edd74e524f118ca3fe" +SRCREV = "7f9c648dad6473469b4133898fa6bb8d818ecff9" SRC_URI = " \ git://github.com/raspberrypi/linux.git;branch=rpi-4.9.y \ file://0001-menuconfig-check-lxdiaglog.sh-Allow-specification-of.patch \ -- cgit v1.2.1