From: Bruce Ashfield <bruce.ashfi...@gmail.com>
Integrating the following commit(s) to linux-yocto/6.12:
1/1 [
Author: Ross Burton
Email: ross.bur...@arm.com
Subject: arch/arm64/configs: remove CONFIG_SM_DISPCC_8650
Date: Thu, 12 Dec 2024 16:44:00 +0000
This option was removed from the Kconfig in in "clk: qcom: fold
dispcc-sm8650 info dispcc-sm8550"[1] but it was not removed from the
defconfig.
[1] 802b83205519e4253b873bef5c095b147cd69dad
Signed-off-by: Ross Burton <ross.bur...@arm.com>
Signed-off-by: Bruce Ashfield <bruce.ashfi...@gmail.com>
]
Signed-off-by: Bruce Ashfield <bruce.ashfi...@gmail.com>
---
v2: fixed the shortlog to 6.12
Bruce
.../linux/linux-yocto-rt_6.12.bb | 2 +-
.../linux/linux-yocto-tiny_6.12.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_6.12.bb | 22 +++++++++----------
3 files changed, 13 insertions(+), 13 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 ff1962590a..f4fe3bf156 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb
@@ -14,7 +14,7 @@ python () {
raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to
linux-yocto-rt to enable it")
}
-SRCREV_machine ?= "b01e5cf7ee075ac6fae18ee9eb0ecfaaf024f394"
+SRCREV_machine ?= "29974e6f86d7ddc55a72fc44d209b84256c69e21"
SRCREV_meta ?= "38b941ae2f4f28c0ba40b2ba6da466f6f5fe3ba0"
SRC_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.12.bb
b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
index 84c4353008..0ed00fbb64 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb
@@ -17,7 +17,7 @@ DEPENDS += "openssl-native util-linux-native"
KMETA = "kernel-meta"
KCONF_BSP_AUDIT_LEVEL = "2"
-SRCREV_machine ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f"
+SRCREV_machine ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
SRCREV_meta ?= "38b941ae2f4f28c0ba40b2ba6da466f6f5fe3ba0"
PV = "${LINUX_VERSION}+git"
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.12.bb
b/meta/recipes-kernel/linux/linux-yocto_6.12.bb
index 728d7e188c..76f38d8884 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.12.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.12.bb
@@ -18,17 +18,17 @@ KBRANCH:qemux86.104 ?= "v6.12/standard/base"
KBRANCH:qemuloongarch64 ?= "v6.12/standard/base"
KBRANCH:qemumips64 ?= "v6.12/standard/mti-malta64"
-SRCREV_machine:qemuarm ?= "c2bc3bf6168351b86c1940020a05bc3907bd97af"
-SRCREV_machine:qemuarm64 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f"
-SRCREV_machine:qemuloongarch64 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f"
-SRCREV_machine:qemumips ?= "9537ff669bd3fded04ef795aad118851a2bd210c"
-SRCREV_machine:qemuppc ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f"
-SRCREV_machine:qemuriscv64 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f"
-SRCREV_machine:qemuriscv32 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f"
-SRCREV_machine:qemux86 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f"
-SRCREV_machine:qemux86-64 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f"
-SRCREV_machine:qemumips64 ?= "c804d6e613ac8dce9cfde9a245ad3496ad835e0c"
-SRCREV_machine ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f"
+SRCREV_machine:qemuarm ?= "0c33fda4cb5c0a3dfbdbb2040a8b4affbb34e00a"
+SRCREV_machine:qemuarm64 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
+SRCREV_machine:qemuloongarch64 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
+SRCREV_machine:qemumips ?= "cb10a94d7ca5ce5c00608ffcea74a79df6b15329"
+SRCREV_machine:qemuppc ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
+SRCREV_machine:qemuriscv64 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
+SRCREV_machine:qemuriscv32 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
+SRCREV_machine:qemux86 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
+SRCREV_machine:qemux86-64 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
+SRCREV_machine:qemumips64 ?= "861600ef3aecc4bb78dd57f92e4814c9647f1cd9"
+SRCREV_machine ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
SRCREV_meta ?= "38b941ae2f4f28c0ba40b2ba6da466f6f5fe3ba0"
# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and
you'll
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#208664):
https://lists.openembedded.org/g/openembedded-core/message/208664
Mute This Topic: https://lists.openembedded.org/mt/110084230/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
