From 93ee980ed93e97aa06b25f7fa982a0a607e2b769 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 1 Sep 2019 16:58:00 -0400 Subject: meta-raspberrypi: subtree update:e52158c936..e811912fae Khem Raj (2): mesa: Enable vc4, v3d, kmsro gallium drivers bpftool: Enable for rpi since default kernel is > 4.14 now Martin Jansa (1): raspberrypi-firmware: upgrade to latest to fix vc4-fkms Change-Id: Idf9c5593a9e69fa3f804e6ba8543410ccc9ff5a9 Signed-off-by: Brad Bishop --- .../openembedded-layer/recipes-kernel/linux/bpftool.bbappend | 3 --- meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc | 8 ++++---- meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend | 5 ++--- 3 files changed, 6 insertions(+), 10 deletions(-) delete mode 100644 meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-kernel/linux/bpftool.bbappend diff --git a/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-kernel/linux/bpftool.bbappend b/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-kernel/linux/bpftool.bbappend deleted file mode 100644 index 7536f3903e..0000000000 --- a/meta-raspberrypi/dynamic-layers/openembedded-layer/recipes-kernel/linux/bpftool.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# remove it when we upgrade to kernel > 4.14 -# -COMPATIBLE_HOST_rpi = "null" diff --git a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc index 19c24b5825..f8ae2f57d4 100644 --- a/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc +++ b/meta-raspberrypi/recipes-bsp/common/raspberrypi-firmware.inc @@ -1,10 +1,10 @@ -RPIFW_DATE ?= "20190718" -SRCREV ?= "d36bde339b067bf13b610fd9741d6351c1dafc38" +RPIFW_DATE ?= "20190823" +SRCREV ?= "7163480fff007dc98978899b556dcf06f8a462c8" RPIFW_SRC_URI ?= "https://github.com/raspberrypi/firmware/archive/${SRCREV}.tar.gz" RPIFW_S ?= "${WORKDIR}/firmware-${SRCREV}" SRC_URI = "${RPIFW_SRC_URI}" -SRC_URI[md5sum] = "273fe147e3edc92ce38a0ff6bf49e3b9" -SRC_URI[sha256sum] = "f266df66ce92e7726e894c0c870f0d8e7257434f102ba77bd60640970b689aa3" +SRC_URI[md5sum] = "b10044aa637ed170eef2ca6c1dcc8aba" +SRC_URI[sha256sum] = "012bc542157d03d19c52dfb2ff9e828905d1991a8b33420f1a2e3730040c167f" PV = "${RPIFW_DATE}" diff --git a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend b/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend index 5b3508a311..eaa46f27b6 100644 --- a/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend +++ b/meta-raspberrypi/recipes-graphics/mesa/mesa_%.bbappend @@ -2,6 +2,5 @@ # With oe-core commit 8509e2e1a87578882b71948ccef3b50ccf1228b3 dri3 is set # as default. To state out clearly that Raspi needs dri3 and to avoid surprises # in case oe-core changes this default, we set dri3 explicitly. -PACKAGECONFIG_append_rpi = " gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" -GALLIUMDRIVERS_append_rpi = ",vc4,v3d,kmsro" -DRIDRIVERS_rpi = "" +PACKAGECONFIG_append_rpi = " gallium vc4 v3d kmsro ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)}" +DRIDRIVERS_class-target_rpi = "" -- cgit v1.2.3