summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2025-03-20 09:40:06 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-03-20 17:49:16 +0000
commit0fd090ad964cf12bb9c79a97f10a8613fa60ce92 (patch)
treee79b7fcfff9f6e34bf290f32aa9a4069296e7be9
parent5d2ed873c8399dae572670e7ceec1b226f18aad0 (diff)
downloadpoky-0fd090ad964cf12bb9c79a97f10a8613fa60ce92.tar.gz
linux-yocto/6.12: configuration graphics, I2C and warnings
Integrating the following commit(s) to linux-yocto/.: bb44ae9b bsp/mti-malta32: enable I2C e2396ea2 bsp/qemuriscv32: CONFIG_PAGE_OFFSET not assignable 095395ba cfg/virtio: add DRM frame buffer emulation 88bbdbd5 features/drm-bochs: remove CONFIG_DRM_TTM (From OE-Core rev: 3848ef1d7e4f432880e06c07da8918c59326283a) 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.12.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.12.bb26
3 files changed, 17 insertions, 17 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
index 9ad43410dc..2e16e43628 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
@@ -14,8 +14,8 @@ 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 ?= "fed5fbc6b68a11d4a9055ea8aa481bb2945c9c89" 17SRCREV_machine ?= "81e03d4794dcbe5a29307241dc110f42fa7d7f76"
18SRCREV_meta ?= "2506ff7d20ee515e70964844fa40b35e4fdfbe92" 18SRCREV_meta ?= "bb44ae9b6ada9da4729dfdd4cd6075908a02ba31"
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 \
21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.12;destsuffix=${KMETA};protocol=https" 21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.12;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
index a01b552000..6cd0767092 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
@@ -17,8 +17,8 @@ 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 ?= "c58d3ea5bbce394208d8099e9d6783bb0a0ddd25" 20SRCREV_machine ?= "a8ef1d3063769a834565490956e620d38c1ce708"
21SRCREV_meta ?= "2506ff7d20ee515e70964844fa40b35e4fdfbe92" 21SRCREV_meta ?= "bb44ae9b6ada9da4729dfdd4cd6075908a02ba31"
22 22
23PV = "${LINUX_VERSION}+git" 23PV = "${LINUX_VERSION}+git"
24 24
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.12.bb b/meta/recipes-kernel/linux/linux-yocto_6.12.bb
index d99759dba5..1738300379 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.12.bb
@@ -18,25 +18,25 @@ KBRANCH:qemux86.104 ?= "v6.12/standard/base"
18KBRANCH:qemuloongarch64 ?= "v6.12/standard/base" 18KBRANCH:qemuloongarch64 ?= "v6.12/standard/base"
19KBRANCH:qemumips64 ?= "v6.12/standard/mti-malta64" 19KBRANCH:qemumips64 ?= "v6.12/standard/mti-malta64"
20 20
21SRCREV_machine:qemuarm ?= "416d14d80c6a4cb641d42f95140aff1ede4da75a" 21SRCREV_machine:qemuarm ?= "6c4ce60cf79602b35d0dbb3528737ef9130baeb5"
22SRCREV_machine:qemuarm64 ?= "c58d3ea5bbce394208d8099e9d6783bb0a0ddd25" 22SRCREV_machine:qemuarm64 ?= "a8ef1d3063769a834565490956e620d38c1ce708"
23SRCREV_machine:qemuloongarch64 ?= "c58d3ea5bbce394208d8099e9d6783bb0a0ddd25" 23SRCREV_machine:qemuloongarch64 ?= "a8ef1d3063769a834565490956e620d38c1ce708"
24SRCREV_machine:qemumips ?= "529b1f229abddc1db8f3240a19a0352257cdea49" 24SRCREV_machine:qemumips ?= "8c0b66057f688ffac2ae035a8ee7385cd8d535e9"
25SRCREV_machine:qemuppc ?= "c58d3ea5bbce394208d8099e9d6783bb0a0ddd25" 25SRCREV_machine:qemuppc ?= "a8ef1d3063769a834565490956e620d38c1ce708"
26SRCREV_machine:qemuriscv64 ?= "c58d3ea5bbce394208d8099e9d6783bb0a0ddd25" 26SRCREV_machine:qemuriscv64 ?= "a8ef1d3063769a834565490956e620d38c1ce708"
27SRCREV_machine:qemuriscv32 ?= "c58d3ea5bbce394208d8099e9d6783bb0a0ddd25" 27SRCREV_machine:qemuriscv32 ?= "a8ef1d3063769a834565490956e620d38c1ce708"
28SRCREV_machine:qemux86 ?= "c58d3ea5bbce394208d8099e9d6783bb0a0ddd25" 28SRCREV_machine:qemux86 ?= "a8ef1d3063769a834565490956e620d38c1ce708"
29SRCREV_machine:qemux86-64 ?= "c58d3ea5bbce394208d8099e9d6783bb0a0ddd25" 29SRCREV_machine:qemux86-64 ?= "a8ef1d3063769a834565490956e620d38c1ce708"
30SRCREV_machine:qemumips64 ?= "10419c638ea26a6dbd364c913f7c3d6894c64e23" 30SRCREV_machine:qemumips64 ?= "fd60fdcf820529aad2f28d498f7fccb5bce884d8"
31SRCREV_machine ?= "c58d3ea5bbce394208d8099e9d6783bb0a0ddd25" 31SRCREV_machine ?= "a8ef1d3063769a834565490956e620d38c1ce708"
32SRCREV_meta ?= "2506ff7d20ee515e70964844fa40b35e4fdfbe92" 32SRCREV_meta ?= "bb44ae9b6ada9da4729dfdd4cd6075908a02ba31"
33 33
34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 34# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
35# get the <version>/base branch, which is pure upstream -stable, and the same 35# get the <version>/base branch, which is pure upstream -stable, and the same
36# meta SRCREV as the linux-yocto-standard builds. Select your version using the 36# meta SRCREV as the linux-yocto-standard builds. Select your version using the
37# normal PREFERRED_VERSION settings. 37# normal PREFERRED_VERSION settings.
38BBCLASSEXTEND = "devupstream:target" 38BBCLASSEXTEND = "devupstream:target"
39SRCREV_machine:class-devupstream ?= "4b07fe4a044d863926707e1106ff142427ec6e02" 39SRCREV_machine:class-devupstream ?= "984391de59a1d6918ac9ba63c095decbcfc85c71"
40PN:class-devupstream = "linux-yocto-upstream" 40PN:class-devupstream = "linux-yocto-upstream"
41KBRANCH:class-devupstream = "v6.12/base" 41KBRANCH:class-devupstream = "v6.12/base"
42 42