From 3e52941a5d66c4c9b035535728a1cb1a415c4c19 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 26 Apr 2019 10:52:16 -0400 Subject: 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 Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') 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 () { } SRCREV_machine ?= "04585fb29f99725a27acb96fc25efa0a55a62a8a" -SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6" +SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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" SRCREV_machine_qemuarm ?= "e265300362d7004e3b57bb5cbcfc65fb469b9ce9" SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6" +SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" PV = "${LINUX_VERSION}+git${SRCPV}" 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" SRCREV_machine_qemux86-64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" SRCREV_machine_qemumips64 ?= "437d99225c689f3f192bb834e4d649ea0467ac87" SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6" +SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" # remap qemuarm to qemuarma15 for the 5.0 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg