summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-03-22 13:19:52 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-24 17:45:29 +0000
commit66091728caa0c6aa4bcc1c7f6a9d0c200289c624 (patch)
tree034da27273da4b0bd254f12f1a6e06b3f047a8f2
parenta5c690e9eff7d52bfbb9b4a7643bb8eeae501d12 (diff)
downloadpoky-66091728caa0c6aa4bcc1c7f6a9d0c200289c624.tar.gz
linux-yocto/5.15: split vtpm for more granular inclusion
Integrating the following commit(s) to linux-yocto/.: 382f528ebc8 features/tpm: split into tpm-1.2, tpm-2.0, tpm-2.0-crb and vtpm feature (From OE-Core rev: 7f95949a6ed23c03d11670d8fc4bceafd8e4e440) Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.15.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index b47ba4c2b9..8df4898617 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "5486de5bb7320876bbfe6f92245f6819afed182c" 14SRCREV_machine ?= "5486de5bb7320876bbfe6f92245f6819afed182c"
15SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95" 15SRCREV_meta ?= "50d5442eb4726b54950f32359f36e5aa8b5661af"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index eaa496dbf7..f9af47f861 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine:qemuarm ?= "25cfdd5cd20eb874209ee632b8b4ed567686523b" 18SRCREV_machine:qemuarm ?= "25cfdd5cd20eb874209ee632b8b4ed567686523b"
19SRCREV_machine ?= "e54b9d06bee4c182cb376d570017c7b425369f3a" 19SRCREV_machine ?= "e54b9d06bee4c182cb376d570017c7b425369f3a"
20SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95" 20SRCREV_meta ?= "50d5442eb4726b54950f32359f36e5aa8b5661af"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index 43faa35dc1..c7dcb3a9b0 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "81bdce5b5876571ef092b0392fd56d4f754789b9"
23SRCREV_machine:qemux86-64 ?= "81bdce5b5876571ef092b0392fd56d4f754789b9" 23SRCREV_machine:qemux86-64 ?= "81bdce5b5876571ef092b0392fd56d4f754789b9"
24SRCREV_machine:qemumips64 ?= "7b53697cddec0526e8c10f25e1a6c2bea7d240d2" 24SRCREV_machine:qemumips64 ?= "7b53697cddec0526e8c10f25e1a6c2bea7d240d2"
25SRCREV_machine ?= "81bdce5b5876571ef092b0392fd56d4f754789b9" 25SRCREV_machine ?= "81bdce5b5876571ef092b0392fd56d4f754789b9"
26SRCREV_meta ?= "ea948a0983d7b7820814e5bce4eda3079201bd95" 26SRCREV_meta ?= "50d5442eb4726b54950f32359f36e5aa8b5661af"
27 27
28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
29# get the <version>/base branch, which is pure upstream -stable, and the same 29# get the <version>/base branch, which is pure upstream -stable, and the same