Skip to content

Commit

Permalink
linux-yocto/5.15: fix qemuarm graphical boot
Browse files Browse the repository at this point in the history
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 375366b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
  • Loading branch information
zeddii authored and rpurdie committed May 12, 2022
1 parent 533d5ae commit 17fe907
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion meta/recipes-kernel/linux/linux-yocto_5.15.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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 <version>/base branch, which is pure upstream -stable, and the same
Expand Down

0 comments on commit 17fe907

Please sign in to comment.