From 5f6a1c98383410cd334abd3605619894d144c8e9 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 18 Apr 2025 15:54:46 -0400 Subject: linux-yocto/6.12: cfg: Include iommu.scc for Arrowlake boot support Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Yogesh Tyagi Email: yogesh.tyagi@intel.com Subject: cfg/intel.scc: Include iommu.scc for Arrowlake boot support Date: Mon, 14 Apr 2025 11:55:45 +0530 Move features/iommu/iommu.scc from bsp/intel-common/intel-corei7-64.scc and bsp/intel-x86/intel-x86.scc to cfg/intel.scc to eliminate redundancy and ensure IOMMU support (CONFIG_INTEL_IOMMU=y, etc.) is enabled for genericx86-64 on Intel Arrowlake, resolving boot issues. This changes is needed in 6.12 as well as master branch. https://bugzilla.yoctoproject.org/show_bug.cgi?id=15802 Signed-off-by: Yogesh Tyagi Signed-off-by: Bruce Ashfield ] (From OE-Core rev: ff91efc2ab25880967b82cc709954d10d62b8cbe) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_6.12.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.12.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.12.bb | 2 +- 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 22d7758f8a..774e828fec 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 () { } SRCREV_machine ?= "8569a61bf30561b620c3171431906cd8ddb7d095" -SRCREV_meta ?= "cc3691c02d54e5a5d91ef5dfe670ee80ab323ef3" +SRCREV_meta ?= "6d55bad30f3e379bf2ad98d971d1ada4f48e2eff" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ 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 c7a058599b..50b1787db2 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" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be" -SRCREV_meta ?= "cc3691c02d54e5a5d91ef5dfe670ee80ab323ef3" +SRCREV_meta ?= "6d55bad30f3e379bf2ad98d971d1ada4f48e2eff" 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 4df34f3b0b..5472a8d79f 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" SRCREV_machine:qemux86-64 ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be" SRCREV_machine:qemumips64 ?= "8a34918e22d2fc3b37282d1929e760747762b74e" SRCREV_machine ?= "c2c450e032c7bf2653e50fc0a87329ce5660b6be" -SRCREV_meta ?= "cc3691c02d54e5a5d91ef5dfe670ee80ab323ef3" +SRCREV_meta ?= "6d55bad30f3e379bf2ad98d971d1ada4f48e2eff" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- cgit v1.2.3-54-g00ecf