From f0578c1dfb63be4c5366e537b33caf10e96b3aa9 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 9 Sep 2019 14:56:55 -0400 Subject: meta-raspberrypi: subtree update:e811912fae..866ccc829f Andrei Gherzan (1): linux-raspberrypi: Update 4.19 recipe to 4.19.71 Khem Raj (2): layer.conf: Add zeus to compatible layers eglinfo: Drop bbappend Martin Jansa (1): u-boot-fw-utils: apply the same rpi4 patches as for u-boot recipe Change-Id: I96685a22f825681c6739af38f44c0bda4eaacd1d Signed-off-by: Brad Bishop --- meta-raspberrypi/conf/layer.conf | 2 +- .../recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend | 2 ++ .../recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc | 12 ++++++++++++ .../recipes-bsp/u-boot/u-boot_2019.07.bbappend | 14 ++------------ .../recipes-graphics/eglinfo/eglinfo-fb_%.bbappend | 2 -- .../recipes-graphics/eglinfo/eglinfo-x11_%.bbappend | 2 -- .../recipes-kernel/linux/linux-raspberrypi_4.19.bb | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend create mode 100644 meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc delete mode 100644 meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend delete mode 100644 meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend diff --git a/meta-raspberrypi/conf/layer.conf b/meta-raspberrypi/conf/layer.conf index 019e76be8..c958587b2 100644 --- a/meta-raspberrypi/conf/layer.conf +++ b/meta-raspberrypi/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi" BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PRIORITY_raspberrypi = "9" -LAYERSERIES_COMPAT_raspberrypi = "sumo thud warrior" +LAYERSERIES_COMPAT_raspberrypi = "sumo thud warrior zeus" # Additional license directories. LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend new file mode 100644 index 000000000..3daf157d7 --- /dev/null +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-fw-utils_2019.07.bbappend @@ -0,0 +1,2 @@ +# Apply the same patches for rpi4 as u-boot recipe +require u-boot-rpi4-${PV}.inc diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc new file mode 100644 index 000000000..2ce55a2b1 --- /dev/null +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot-rpi4-2019.07.inc @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend_raspberrypi4 := "${THISDIR}/u-boot-2019.07:" +UBOOT_RPI4_SUPPORT_PATCHES = " \ + file://0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch \ + file://0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch \ + file://0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch \ + file://0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch \ + file://0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch \ + file://0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch \ + file://0007-rpi-Add-memory-map-for-bcm2838.patch \ +" + +SRC_URI_append_raspberrypi4 = "${UBOOT_RPI4_SUPPORT_PATCHES}" diff --git a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend index 7cd8d66c3..3daf157d7 100644 --- a/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend +++ b/meta-raspberrypi/recipes-bsp/u-boot/u-boot_2019.07.bbappend @@ -1,12 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -UBOOT_RPI4_SUPPORT_PATCHES = " \ - file://0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch \ - file://0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch \ - file://0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch \ - file://0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch \ - file://0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch \ - file://0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch \ - file://0007-rpi-Add-memory-map-for-bcm2838.patch \ -" - -SRC_URI_append_raspberrypi4 = "${UBOOT_RPI4_SUPPORT_PATCHES}" +# Apply the same patches for rpi4 as u-boot recipe +require u-boot-rpi4-${PV}.inc diff --git a/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend b/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend deleted file mode 100644 index c152bd973..000000000 --- a/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-fb_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -EGLINFO_DEVICE_rpi = "raspberrypi" -COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'null', '(.*)', d)}" diff --git a/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend b/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend deleted file mode 100644 index 2d720baaa..000000000 --- a/meta-raspberrypi/recipes-graphics/eglinfo/eglinfo-x11_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -EGLINFO_DEVICE_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', 'generic', 'raspberrypi', d)}" -ASNEEDED = "" diff --git a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb index 230f7494b..900570de1 100644 --- a/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb +++ b/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_4.19.bb @@ -1,6 +1,6 @@ -LINUX_VERSION ?= "4.19.66" +LINUX_VERSION ?= "4.19.71" LINUX_RPI_BRANCH ?= "rpi-4.19.y" -SRCREV = "fc5826fb999e0b32900d1f487e90c27a92010214" +SRCREV = "13ce09db830e0c2fe524460b0673afb974359bc2" require linux-raspberrypi_4.19.inc -- cgit v1.2.3