summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2025-04-20 22:45:32 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-04-23 19:48:04 +0100
commit528b36636b5742ffac6d82e80326d4534313bc09 (patch)
treecf707463dbb5101d7d39e25fb1098ac75fe46b8d
parent5f6a1c98383410cd334abd3605619894d144c8e9 (diff)
downloadpoky-528b36636b5742ffac6d82e80326d4534313bc09.tar.gz
linux-yocto/6.12: cfg: fix iommu configuration for -tiny kernel
Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Bruce Ashfield Email: bruce.ashfield@gmail.com Subject: iommu: add config dependencies Date: Sun, 20 Apr 2025 22:28:21 -0400 commit [cfg/intel.scc: Include iommu.scc for Arrowlake boot support] moves the iommu configuration to a location that is included by more BSPs and kernel types. One of those kernel types is the -tiny kernel, which uses a allnoconfig base. Due to the allnoconfig, there are missing dependencies to allow the desired options to be enabled in the final .config Those missing options throw configuration audit warnings By adding the required dependencies to the fragment, it is now standalone and can be included from anywhere without configuration audit warnings being triggered. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: 795594476c6fabd5391dc35f254de8028f7c47d6) 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 774e828fec..44346445c4 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 ?= "8569a61bf30561b620c3171431906cd8ddb7d095" 17SRCREV_machine ?= "8569a61bf30561b620c3171431906cd8ddb7d095"
18SRCREV_meta ?= "6d55bad30f3e379bf2ad98d971d1ada4f48e2eff" 18SRCREV_meta ?= "d36334a8b9597faf3978548085097c3b54d462d1"
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 50b1787db2..d9c62737a4 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 ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be" 20SRCREV_machine ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be"
21SRCREV_meta ?= "6d55bad30f3e379bf2ad98d971d1ada4f48e2eff" 21SRCREV_meta ?= "d36334a8b9597faf3978548085097c3b54d462d1"
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 5472a8d79f..e45a8a61d4 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 ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be"
29SRCREV_machine:qemux86-64 ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be" 29SRCREV_machine:qemux86-64 ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be"
30SRCREV_machine:qemumips64 ?= "8a34918e22d2fc3b37282d1929e760747762b74e" 30SRCREV_machine:qemumips64 ?= "8a34918e22d2fc3b37282d1929e760747762b74e"
31SRCREV_machine ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be" 31SRCREV_machine ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be"
32SRCREV_meta ?= "6d55bad30f3e379bf2ad98d971d1ada4f48e2eff" 32SRCREV_meta ?= "d36334a8b9597faf3978548085097c3b54d462d1"
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