From 17fe9070f9ee9fa5a493e9090686223f17882058 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sat, 30 Apr 2022 17:33:53 -0400 Subject: linux-yocto/5.15: fix qemuarm graphical boot During the cleanup/refactoring of qemuarm* we dropped a PCI option that is required for graphical boot. The configuration is fixed to create a separate fragment, which just enabled the minimim and we include it into qemuarma15 standard/preempt-rt. Integrating the following commit(s) to linux-yocto/5.15: fcf48627ea5 qemuarma15: include pci-of-generic support (From OE-Core rev: ccd27ea8b8e179b7eb0526ed1416ca674c9d295e) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 375366bd16619b14f718f96a9235d0936cae97ac) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 95a250080d..afcc715918 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "2b74bd6a3a2341f079f914171bc92eadc8a7deaa" -SRCREV_meta ?= "7aedb91750c4157186761d01d1ab4b4114986071" +SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 465e16f1da..9a708804c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -15,7 +15,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "9107fb1e04c2da3d84e1967aeb7f5bc190423d5b" -SRCREV_meta ?= "7aedb91750c4157186761d01d1ab4b4114986071" +SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 7ccb13195f..0aef531659 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" SRCREV_machine:qemux86-64 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" SRCREV_machine:qemumips64 ?= "1822ceafc13337881a81edeb7093b0c095d9efca" SRCREV_machine ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" -SRCREV_meta ?= "7aedb91750c4157186761d01d1ab4b4114986071" +SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- cgit v1.2.3-54-g00ecf