summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2025-06-02 22:48:57 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-06-05 11:02:21 +0100
commit80753bf52b2cef42a3060299c9a0e46b35972b2d (patch)
treec17d7451d03429092e3d0a6cb244df78b9473470
parent5f624ba33792734a7f69b964d38397cdad2c1862 (diff)
downloadpoky-80753bf52b2cef42a3060299c9a0e46b35972b2d.tar.gz
linux-yocto/6.12: revert riscv config sync
Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Khem Raj Email: raj.khem@gmail.com Subject: Revert "bsp/qemuriscv32: Sync config with upstream defconfig 6.12+" Date: Thu, 29 May 2025 18:53:48 -0700 These options are infact required for qemu riscv32 emulation. This reverts commit 64e08f7f69c662efe5f3780e7e42fc80635ad16f. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: 1baa2ede9b759632bd97f3308752ec863dc6543e) 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.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.12.bb2
3 files changed, 3 insertions, 3 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 24d93645ca..2088717489 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
@@ -15,7 +15,7 @@ python () {
15} 15}
16 16
17SRCREV_machine ?= "3d3d56a846c993611859096016322dccea1317cd" 17SRCREV_machine ?= "3d3d56a846c993611859096016322dccea1317cd"
18SRCREV_meta ?= "60484dda26122958e5f4d8f813424fa637770bf6" 18SRCREV_meta ?= "3a5fec1707626251d69b7548f024856d838cc7db"
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 042adf94d0..90a00f7cd5 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "0898369ce44f92eba60ae9bf0013bc4338ce840e" 20SRCREV_machine ?= "0898369ce44f92eba60ae9bf0013bc4338ce840e"
21SRCREV_meta ?= "60484dda26122958e5f4d8f813424fa637770bf6" 21SRCREV_meta ?= "3a5fec1707626251d69b7548f024856d838cc7db"
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 e282a89983..790e1a03c1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.12.bb
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "0898369ce44f92eba60ae9bf0013bc4338ce840e"
29SRCREV_machine:qemux86-64 ?= "0898369ce44f92eba60ae9bf0013bc4338ce840e" 29SRCREV_machine:qemux86-64 ?= "0898369ce44f92eba60ae9bf0013bc4338ce840e"
30SRCREV_machine:qemumips64 ?= "98a85ed93bd5eaefe30c4aa3f7c15549be2bd032" 30SRCREV_machine:qemumips64 ?= "98a85ed93bd5eaefe30c4aa3f7c15549be2bd032"
31SRCREV_machine ?= "0898369ce44f92eba60ae9bf0013bc4338ce840e" 31SRCREV_machine ?= "0898369ce44f92eba60ae9bf0013bc4338ce840e"
32SRCREV_meta ?= "60484dda26122958e5f4d8f813424fa637770bf6" 32SRCREV_meta ?= "3a5fec1707626251d69b7548f024856d838cc7db"
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