summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-04-26 10:52:16 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-12 09:13:39 +0100
commit96ae9c18eae3ed24670eba8d0e71b586d12f0610 (patch)
tree2a2bb121fe1470fecbc10e41a7cf8f03ef745ed0 /meta/recipes-kernel
parentc43959dc9b4eb549ff1b28bf30f4ea6292368891 (diff)
downloadpoky-96ae9c18eae3ed24670eba8d0e71b586d12f0610.tar.gz
linux-yocto/5.0: port RAID configuration tweaks from master
Porting the following three RAID config changes from master to the 5.0 branch: ffd8cf5baf8 intel-x86: add Intel VMD support 8edf951a15c cfg/efi.cfg: built-in CONFIG_EFIVAR_FS to support Intel VROC 041a6c04244 intel-x86: built-in nvme driver to support boot from nvme disk (From OE-Core rev: 8a0b045e8c31a706f8254db971b0348c6f144758) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@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_5.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.0.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
index 842aa5b93f..07fa910ee8 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "04585fb29f99725a27acb96fc25efa0a55a62a8a" 14SRCREV_machine ?= "04585fb29f99725a27acb96fc25efa0a55a62a8a"
15SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6" 15SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30"
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.0;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
index eba6cc6f47..c1084f2bb9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "e265300362d7004e3b57bb5cbcfc65fb469b9ce9" 18SRCREV_machine_qemuarm ?= "e265300362d7004e3b57bb5cbcfc65fb469b9ce9"
19SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" 19SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
20SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6" 20SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
index fe773bed98..01269dda27 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
19SRCREV_machine_qemux86-64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" 19SRCREV_machine_qemux86-64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
20SRCREV_machine_qemumips64 ?= "437d99225c689f3f192bb834e4d649ea0467ac87" 20SRCREV_machine_qemumips64 ?= "437d99225c689f3f192bb834e4d649ea0467ac87"
21SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" 21SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8"
22SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6" 22SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30"
23 23
24# remap qemuarm to qemuarma15 for the 5.0 kernel 24# remap qemuarm to qemuarma15 for the 5.0 kernel
25# KMACHINE_qemuarm ?= "qemuarma15" 25# KMACHINE_qemuarm ?= "qemuarma15"