linux-yocto/6.6: beaglebone: drop nonassignable kernel options

Integrating the following commit(s) to linux-yocto/.:

1/1 [
    Author: Kevin Hao
    Email: kexin.hao@windriver.com
    Subject: beaglebone: Drop the nonassignable kernel options
    Date: Sat, 20 Jan 2024 20:19:20 +0800

    These kernel options aren't assignable. In the previous version of the
    kernel, these options were selected by DRM_FBDEV_EMULATION. But due to
    the commit 43049f17b526 ("drm/i915: Implement dedicated fbdev I/O
    helpers") in the new version of kernel, they are no longer enabled
    by DRM_FBDEV_EMULATION. Then the kernel config check emits unmatch
    warning for them. Drop all of them to fix these warnings.

    Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
    Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
index 25ff894ef25ef770257c34692e6a8ef4298e55b5..22a93880fc09c27ad1db5af97a0242557f34192b 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb
@@ -15,7 +15,7 @@ python () {
 }
 
 SRCREV_machine ?= "59ee8cb752a7e280cfe2d480964aa5b6c74e4203"
-SRCREV_meta ?= "80606e5b79499427524c82e4965de27e1f57c61c"
+SRCREV_meta ?= "cdacaee0449386523770415ceeded76585064265"
 
 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.6;destsuffix=${KMETA};protocol=https"

diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
index b530990f206802e928d632071295f48cbbaf6107..66199674a67bd0df62a32fd8f223aa5cc63e4753 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine ?= "195b2994f955071be3dd16ff61127dbc6b2e0069"
-SRCREV_meta ?= "80606e5b79499427524c82e4965de27e1f57c61c"
+SRCREV_meta ?= "cdacaee0449386523770415ceeded76585064265"
 
 PV = "${LINUX_VERSION}+git"
 

diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index ed722f2f80470538341836b65bb89b9e1583a77d..ce9169ac761d3b17552f162514003ba4cb98c1ec 100644 (file)
--- a/meta/recipes-kernel/linux/linux-yocto_6.6.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "195b2994f955071be3dd16ff61127dbc6b2e0069"
 SRCREV_machine:qemux86-64 ?= "195b2994f955071be3dd16ff61127dbc6b2e0069"
 SRCREV_machine:qemumips64 ?= "d41c8b84fcfcb4c2dd8eb856172cdc2b6a1bd342"
 SRCREV_machine ?= "195b2994f955071be3dd16ff61127dbc6b2e0069"
-SRCREV_meta ?= "80606e5b79499427524c82e4965de27e1f57c61c"
+SRCREV_meta ?= "cdacaee0449386523770415ceeded76585064265"
 
 # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
 # get the <version>/base branch, which is pure upstream -stable, and the same