summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-03-19 19:01:29 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-03-20 18:20:38 +0000
commite686282da895ed1217e3cb2f02359d621dcdeb54 (patch)
tree3f4d4b4ff01dd0f99c2900f34cd8471bef3384bc /meta/recipes-kernel
parentb352ffe7706f82100ff5df3f78709527252e9ce7 (diff)
downloadpoky-e686282da895ed1217e3cb2f02359d621dcdeb54.tar.gz
linux-yocto/6.6: cfg: drop unsettable options
Integrating the following commit(s) to linux-yocto/.: 1/3 [ Author: Yongxin Liu Email: yongxin.liu@windriver.com Subject: features/vfio: remove CONFIG_VFIO_VIRQFD Date: Mon, 18 Mar 2024 19:10:37 +0800 CONFIG_VFIO_VIRQFD was changed to bool in kernel commit e2d55709398e ("vfio: Fold vfio_virqfd.ko into vfio.ko") and it is not user selectable. Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] 2/3 [ Author: Yongxin Liu Email: yongxin.liu@windriver.com Subject: features/vfio: remove CONFIG_VFIO_MDEV Date: Mon, 18 Mar 2024 19:10:38 +0800 CONFIG_VFIO_MDEV wasn't a user choice after kerne commit 8bf8c5ee1f38 ("vfio-mdev: turn VFIO_MDEV into a selectable symbol"). Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] 3/3 [ Author: Yongxin Liu Email: yongxin.liu@windriver.com Subject: bsp/intel-x86: remove CONFIG_IXGB Date: Mon, 18 Mar 2024 19:10:39 +0800 ixgb driver was removed in kernel commit e485f3a6eae0 ("ixgb: Remove ixgb driver"). Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: 3051b5cdcc03cf7f5a5962bea33f9090b984ab26) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.6.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.6.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.6.bb2
3 files changed, 3 insertions, 3 deletions
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 7076a40e1f..1298369d40 100644
--- 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 () {
15} 15}
16 16
17SRCREV_machine ?= "689f65582b3d9a948903cde4e9c29e5fafd1bced" 17SRCREV_machine ?= "689f65582b3d9a948903cde4e9c29e5fafd1bced"
18SRCREV_meta ?= "5b185a8716c8c62dc1c7751e6d12f8b67f58274f" 18SRCREV_meta ?= "cc42f74d7d099826d46d3b310fda9c0c7bbb1477"
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.6;destsuffix=${KMETA};protocol=https" 21 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 f6f4762cbc..82486defd7 100644
--- 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"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "4d67f3ece8ca6f730f43ea8fdb9acf79c0c7bc46" 20SRCREV_machine ?= "4d67f3ece8ca6f730f43ea8fdb9acf79c0c7bc46"
21SRCREV_meta ?= "5b185a8716c8c62dc1c7751e6d12f8b67f58274f" 21SRCREV_meta ?= "cc42f74d7d099826d46d3b310fda9c0c7bbb1477"
22 22
23PV = "${LINUX_VERSION}+git" 23PV = "${LINUX_VERSION}+git"
24 24
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.6.bb b/meta/recipes-kernel/linux/linux-yocto_6.6.bb
index aaea980df0..3409ce0c8a 100644
--- 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 ?= "4d67f3ece8ca6f730f43ea8fdb9acf79c0c7bc46"
29SRCREV_machine:qemux86-64 ?= "4d67f3ece8ca6f730f43ea8fdb9acf79c0c7bc46" 29SRCREV_machine:qemux86-64 ?= "4d67f3ece8ca6f730f43ea8fdb9acf79c0c7bc46"
30SRCREV_machine:qemumips64 ?= "fe3df2eeb1cca6792c09e6a6530671533ce584e5" 30SRCREV_machine:qemumips64 ?= "fe3df2eeb1cca6792c09e6a6530671533ce584e5"
31SRCREV_machine ?= "4d67f3ece8ca6f730f43ea8fdb9acf79c0c7bc46" 31SRCREV_machine ?= "4d67f3ece8ca6f730f43ea8fdb9acf79c0c7bc46"
32SRCREV_meta ?= "5b185a8716c8c62dc1c7751e6d12f8b67f58274f" 32SRCREV_meta ?= "cc42f74d7d099826d46d3b310fda9c0c7bbb1477"
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