diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-03-22 13:19:51 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-24 17:45:29 +0000 |
commit | a5c690e9eff7d52bfbb9b4a7643bb8eeae501d12 (patch) | |
tree | 59d5f145743e56081ef23a98d8d542dd9c3cbea6 /meta/recipes-kernel | |
parent | 9bc13f657bf621fb50c80eca748d035b36433406 (diff) | |
download | poky-a5c690e9eff7d52bfbb9b4a7643bb8eeae501d12.tar.gz |
linux-yocto/5.10: split vtpm for more granular inclusion
Integrating the following commit(s) to linux-yocto/.:
6ca1d510a03 features/tpm: split into tpm-1.2, tpm-2.0, tpm-2.0-crb and vtpm feature
(From OE-Core rev: b61be908468b1057a9d2baf40c1ebfbbd74732b8)
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>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 36eb86f8c1..5852730422 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "e0d87d9831a6e0df20a370adc9aba0d032d91661" | 14 | SRCREV_machine ?= "e0d87d9831a6e0df20a370adc9aba0d032d91661" |
15 | SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" | 15 | SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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.10;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 2c46c665a0..48e5a4f871 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | |||
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" | |||
17 | 17 | ||
18 | SRCREV_machine:qemuarm ?= "38f8b1b5b87959e6cb9367151e233d27befe015d" | 18 | SRCREV_machine:qemuarm ?= "38f8b1b5b87959e6cb9367151e233d27befe015d" |
19 | SRCREV_machine ?= "cc70f051e56005acda2e6ea994cadfb2538e66f6" | 19 | SRCREV_machine ?= "cc70f051e56005acda2e6ea994cadfb2538e66f6" |
20 | SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" | 20 | SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 3d3ee6d623..0a80790636 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb | |||
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" | |||
23 | SRCREV_machine:qemux86-64 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" | 23 | SRCREV_machine:qemux86-64 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" |
24 | SRCREV_machine:qemumips64 ?= "a1b43f69bce61143dd4d6d637f619eadd3fabb6e" | 24 | SRCREV_machine:qemumips64 ?= "a1b43f69bce61143dd4d6d637f619eadd3fabb6e" |
25 | SRCREV_machine ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" | 25 | SRCREV_machine ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" |
26 | SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" | 26 | SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" |
27 | 27 | ||
28 | # remap qemuarm to qemuarma15 for the 5.8 kernel | 28 | # remap qemuarm to qemuarma15 for the 5.8 kernel |
29 | # KMACHINE:qemuarm ?= "qemuarma15" | 29 | # KMACHINE:qemuarm ?= "qemuarma15" |