summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-12-12 12:49:48 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-13 08:23:16 +0000
commit4be6d8c0a92cfeef4b879e16bd9870a949139bbe (patch)
tree9d0d096ff8ee15abe73d9d606a73f5470bb33a7c
parentf71c144f0d3bbbf371cf8a37f2c6f4ef6ac70b0c (diff)
downloadpoky-4be6d8c0a92cfeef4b879e16bd9870a949139bbe.tar.gz
linux-yoto/6.12: bsp/genericarm64: fix configuration warning
Integrating the following commit(s) to linux-yocto/6.12: 1/1 [ Author: Ross Burton Email: ross.burton@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.burton@arm.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: bfed6922fc7ddf8bc30dc2ba5a3aae896d0a2de3) 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.bb22
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 () {
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 ?= "b01e5cf7ee075ac6fae18ee9eb0ecfaaf024f394" 17SRCREV_machine ?= "29974e6f86d7ddc55a72fc44d209b84256c69e21"
18SRCREV_meta ?= "38b941ae2f4f28c0ba40b2ba6da466f6f5fe3ba0" 18SRCREV_meta ?= "38b941ae2f4f28c0ba40b2ba6da466f6f5fe3ba0"
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.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"
17KMETA = "kernel-meta" 17KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f" 20SRCREV_machine ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
21SRCREV_meta ?= "38b941ae2f4f28c0ba40b2ba6da466f6f5fe3ba0" 21SRCREV_meta ?= "38b941ae2f4f28c0ba40b2ba6da466f6f5fe3ba0"
22 22
23PV = "${LINUX_VERSION}+git" 23PV = "${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"
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 ?= "c2bc3bf6168351b86c1940020a05bc3907bd97af" 21SRCREV_machine:qemuarm ?= "0c33fda4cb5c0a3dfbdbb2040a8b4affbb34e00a"
22SRCREV_machine:qemuarm64 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f" 22SRCREV_machine:qemuarm64 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
23SRCREV_machine:qemuloongarch64 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f" 23SRCREV_machine:qemuloongarch64 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
24SRCREV_machine:qemumips ?= "9537ff669bd3fded04ef795aad118851a2bd210c" 24SRCREV_machine:qemumips ?= "cb10a94d7ca5ce5c00608ffcea74a79df6b15329"
25SRCREV_machine:qemuppc ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f" 25SRCREV_machine:qemuppc ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
26SRCREV_machine:qemuriscv64 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f" 26SRCREV_machine:qemuriscv64 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
27SRCREV_machine:qemuriscv32 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f" 27SRCREV_machine:qemuriscv32 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
28SRCREV_machine:qemux86 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f" 28SRCREV_machine:qemux86 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
29SRCREV_machine:qemux86-64 ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f" 29SRCREV_machine:qemux86-64 ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
30SRCREV_machine:qemumips64 ?= "c804d6e613ac8dce9cfde9a245ad3496ad835e0c" 30SRCREV_machine:qemumips64 ?= "861600ef3aecc4bb78dd57f92e4814c9647f1cd9"
31SRCREV_machine ?= "48f49b0d6627a29c4dbe99cf2faa299acf4ca61f" 31SRCREV_machine ?= "7160a4379dccf0e95526f1ab9be4ef704835074a"
32SRCREV_meta ?= "38b941ae2f4f28c0ba40b2ba6da466f6f5fe3ba0" 32SRCREV_meta ?= "38b941ae2f4f28c0ba40b2ba6da466f6f5fe3ba0"
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