summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-08-08 23:31:56 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-08-09 12:40:14 +0100
commit5ec6e05cbcaf177e9f1314177be26473df6b9a0d (patch)
treecd4317f80c254f0e29292124318313ecacd3191d
parentbc08748b3bfea32e03485ced1088f7f90bdf7315 (diff)
downloadpoky-5ec6e05cbcaf177e9f1314177be26473df6b9a0d.tar.gz
linux-yocto/6.4: fix qemuarm boot failure
Integrating the following commit(s) to linux-yocto/6.4: 72bad8cd7540 drm/fb-helper: move zeroing code to drm_fb_helper_fill_var (From OE-Core rev: 366d7876a70ab8833ccc0cb6607aac7e8a0311b8) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.4.bb22
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
index c624b2dac8..8cc39faf9c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb
@@ -14,7 +14,7 @@ python () {
14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 14 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
15} 15}
16 16
17SRCREV_machine ?= "0bcc161e5d456bcbcfa6852e5e7750636a00ce46" 17SRCREV_machine ?= "121d700ad4b877fab9238a92356ad32506ef70d5"
18SRCREV_meta ?= "8dc4f68eb852784a5bc82d30768ac3276c890754" 18SRCREV_meta ?= "8dc4f68eb852784a5bc82d30768ac3276c890754"
19 19
20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ 20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
index 409a95e633..834d07be48 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb
@@ -17,7 +17,7 @@ DEPENDS += "openssl-native util-linux-native"
17KMETA = "kernel-meta" 17KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "80174b01645669e6d83c7c1532fa2661438ba49d" 20SRCREV_machine ?= "72bad8cd7540f07ab54e08b83ad106dec0df123c"
21SRCREV_meta ?= "8dc4f68eb852784a5bc82d30768ac3276c890754" 21SRCREV_meta ?= "8dc4f68eb852784a5bc82d30768ac3276c890754"
22 22
23PV = "${LINUX_VERSION}+git${SRCPV}" 23PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
index 527b09087c..4deb7bc537 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb
@@ -17,17 +17,17 @@ KBRANCH:qemux86-64 ?= "v6.4/standard/base"
17KBRANCH:qemuloongarch64 ?= "v6.4/standard/base" 17KBRANCH:qemuloongarch64 ?= "v6.4/standard/base"
18KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64" 18KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64"
19 19
20SRCREV_machine:qemuarm ?= "4d6b5d3235770e00b35d53c0dd33827624e0dba3" 20SRCREV_machine:qemuarm ?= "16af0b21320a78b21d5d9ded1188e398352d262a"
21SRCREV_machine:qemuarm64 ?= "80174b01645669e6d83c7c1532fa2661438ba49d" 21SRCREV_machine:qemuarm64 ?= "72bad8cd7540f07ab54e08b83ad106dec0df123c"
22SRCREV_machine:qemuloongarch64 ?= "80174b01645669e6d83c7c1532fa2661438ba49d" 22SRCREV_machine:qemuloongarch64 ?= "72bad8cd7540f07ab54e08b83ad106dec0df123c"
23SRCREV_machine:qemumips ?= "1504fdd2f568bf0f39042b69e282a9e6042594a1" 23SRCREV_machine:qemumips ?= "de46701cb3ac494b27ae70f1475efb855e9d817a"
24SRCREV_machine:qemuppc ?= "80174b01645669e6d83c7c1532fa2661438ba49d" 24SRCREV_machine:qemuppc ?= "72bad8cd7540f07ab54e08b83ad106dec0df123c"
25SRCREV_machine:qemuriscv64 ?= "80174b01645669e6d83c7c1532fa2661438ba49d" 25SRCREV_machine:qemuriscv64 ?= "72bad8cd7540f07ab54e08b83ad106dec0df123c"
26SRCREV_machine:qemuriscv32 ?= "80174b01645669e6d83c7c1532fa2661438ba49d" 26SRCREV_machine:qemuriscv32 ?= "72bad8cd7540f07ab54e08b83ad106dec0df123c"
27SRCREV_machine:qemux86 ?= "80174b01645669e6d83c7c1532fa2661438ba49d" 27SRCREV_machine:qemux86 ?= "72bad8cd7540f07ab54e08b83ad106dec0df123c"
28SRCREV_machine:qemux86-64 ?= "80174b01645669e6d83c7c1532fa2661438ba49d" 28SRCREV_machine:qemux86-64 ?= "72bad8cd7540f07ab54e08b83ad106dec0df123c"
29SRCREV_machine:qemumips64 ?= "a55946081548eb8b23d5e1da3aa7f469addef1c8" 29SRCREV_machine:qemumips64 ?= "47d7881e76d678cc9dc034f0acdd1bc416fa05bb"
30SRCREV_machine ?= "80174b01645669e6d83c7c1532fa2661438ba49d" 30SRCREV_machine ?= "72bad8cd7540f07ab54e08b83ad106dec0df123c"
31SRCREV_meta ?= "8dc4f68eb852784a5bc82d30768ac3276c890754" 31SRCREV_meta ?= "8dc4f68eb852784a5bc82d30768ac3276c890754"
32 32
33# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 33# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll