summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-12-16 22:38:29 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 20:14:44 +0000
commitde7be89608e199560a6fbcfb78d35083e290a2e4 (patch)
tree1276f7c3fab85a9a84830a16f12d5a6ab4c2fedb /meta
parenta4e7bb534610707de4f995fd1e66ec3dbd258199 (diff)
downloadpoky-de7be89608e199560a6fbcfb78d35083e290a2e4.tar.gz
linux-yocto: configuration updates (virtio and tpm)
Integrating the following configuration changes: 1992fb4dad30 virtio.cfg: enable CONFIG_DRM_VIRTIO_GPU 9e9ba7cb6756 features/tpm: enable tpm support (From OE-Core rev: c4e273f6a2213ac898fbc504b9bfc12af633c9b8) (From OE-Core rev: a6356975709cb7bcfbea60ce9f1507583eccd2e2) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [Drop 4.19 changes] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.18.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
index aa8c580301..ae620f578f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.18.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "6228ee37a46479d624e608c572d241f74eee11b6" 14SRCREV_machine ?= "6228ee37a46479d624e608c572d241f74eee11b6"
15SRCREV_meta ?= "9e7df3b788749a9b804bf3856fe032089b79d1c1" 15SRCREV_meta ?= "cc2fb5bd0e71f4beec5c4ce726da0a87e2d55337"
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-4.18;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
index 01aeed9999..24a12fc052 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.18.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "bd4312baf01b5aca2745245c3856b5143bf0c6ad" 18SRCREV_machine_qemuarm ?= "bd4312baf01b5aca2745245c3856b5143bf0c6ad"
19SRCREV_machine ?= "9eddc793f95f4e7e283996a007e205622c633539" 19SRCREV_machine ?= "9eddc793f95f4e7e283996a007e205622c633539"
20SRCREV_meta ?= "9e7df3b788749a9b804bf3856fe032089b79d1c1" 20SRCREV_meta ?= "cc2fb5bd0e71f4beec5c4ce726da0a87e2d55337"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.18.bb b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
index ae43598104..94f2c9c473 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.18.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.18.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "9eddc793f95f4e7e283996a007e205622c633539"
19SRCREV_machine_qemux86-64 ?= "9eddc793f95f4e7e283996a007e205622c633539" 19SRCREV_machine_qemux86-64 ?= "9eddc793f95f4e7e283996a007e205622c633539"
20SRCREV_machine_qemumips64 ?= "6641acbf076ba3f7ad96e846581272215a537904" 20SRCREV_machine_qemumips64 ?= "6641acbf076ba3f7ad96e846581272215a537904"
21SRCREV_machine ?= "9eddc793f95f4e7e283996a007e205622c633539" 21SRCREV_machine ?= "9eddc793f95f4e7e283996a007e205622c633539"
22SRCREV_meta ?= "9e7df3b788749a9b804bf3856fe032089b79d1c1" 22SRCREV_meta ?= "cc2fb5bd0e71f4beec5c4ce726da0a87e2d55337"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.18;destsuffix=${KMETA}"