diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-30 17:33:53 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-12 16:44:05 +0100 |
commit | 17fe9070f9ee9fa5a493e9090686223f17882058 (patch) | |
tree | 8fbbf8dec09fd898ff5ecfa74a8731adf07de246 | |
parent | 533d5ae8c41a7af4bd3dd7c2d9402c3c8cf3d5ed (diff) | |
download | poky-17fe9070f9ee9fa5a493e9090686223f17882058.tar.gz |
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 <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 375366bd16619b14f718f96a9235d0936cae97ac)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 | ||||
-rw-r--r-- | 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 () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "2b74bd6a3a2341f079f914171bc92eadc8a7deaa" | 14 | SRCREV_machine ?= "2b74bd6a3a2341f079f914171bc92eadc8a7deaa" |
15 | SRCREV_meta ?= "7aedb91750c4157186761d01d1ab4b4114986071" | 15 | SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" | 18 | 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" | |||
15 | KCONF_BSP_AUDIT_LEVEL = "2" | 15 | KCONF_BSP_AUDIT_LEVEL = "2" |
16 | 16 | ||
17 | SRCREV_machine ?= "9107fb1e04c2da3d84e1967aeb7f5bc190423d5b" | 17 | SRCREV_machine ?= "9107fb1e04c2da3d84e1967aeb7f5bc190423d5b" |
18 | SRCREV_meta ?= "7aedb91750c4157186761d01d1ab4b4114986071" | 18 | SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" |
19 | 19 | ||
20 | PV = "${LINUX_VERSION}+git${SRCPV}" | 20 | PV = "${LINUX_VERSION}+git${SRCPV}" |
21 | 21 | ||
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" | |||
23 | SRCREV_machine:qemux86-64 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" | 23 | SRCREV_machine:qemux86-64 ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" |
24 | SRCREV_machine:qemumips64 ?= "1822ceafc13337881a81edeb7093b0c095d9efca" | 24 | SRCREV_machine:qemumips64 ?= "1822ceafc13337881a81edeb7093b0c095d9efca" |
25 | SRCREV_machine ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" | 25 | SRCREV_machine ?= "ebfb1822e9f9726d8c587fc0f60cfed43fa0873e" |
26 | SRCREV_meta ?= "7aedb91750c4157186761d01d1ab4b4114986071" | 26 | SRCREV_meta ?= "fcf48627ea549df12be5d651521fc97a01b1986c" |
27 | 27 | ||
28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 28 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
29 | # get the <version>/base branch, which is pure upstream -stable, and the same | 29 | # get the <version>/base branch, which is pure upstream -stable, and the same |