summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-03-24 23:11:56 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-25 23:19:53 +0000
commit53057137ba8e683207140462fe7de515ee9ad0a1 (patch)
tree107adfd812f0c2ee14a6aab594a0e6b3293d68e8 /meta
parent1e90576a036520db4d1f5f4fec3cac790f0d7a0e (diff)
downloadpoky-53057137ba8e683207140462fe7de515ee9ad0a1.tar.gz
linux-yocto/5.0: x86/resctrl: Rename INTEL_RDT to RESCTRL
The following upstream commits have renamed INTEL_RDT to RESCTRL. 6fe07ce35e8a ("x86/resctrl: Rename the config option INTEL_RDT to RESCTRL") e6d429313ea5 ("x86/resctrl: Avoid confusion over the new X86_RESCTRL config") (From OE-Core rev: 7c33bfc37b154efce28c359f527ad32063479122) Signed-off-by: He Zhe <zhe.he@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@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_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 204f70030a..65c3698495 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 ?= "06e1ff79ea9efef052404ee1989cae038b28e954" 14SRCREV_machine ?= "06e1ff79ea9efef052404ee1989cae038b28e954"
15SRCREV_meta ?= "806a4922a78c0f447e3d0f61fe6b3cce1e2c0acb" 15SRCREV_meta ?= "705457837e7ddd27e4e2ecf6d3dbd255b1aaf848"
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 105273ff7c..dc60548c6f 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 ?= "b0477279877bb2b5cca6ec49c64e931901ff2022" 18SRCREV_machine_qemuarm ?= "b0477279877bb2b5cca6ec49c64e931901ff2022"
19SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" 19SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
20SRCREV_meta ?= "806a4922a78c0f447e3d0f61fe6b3cce1e2c0acb" 20SRCREV_meta ?= "705457837e7ddd27e4e2ecf6d3dbd255b1aaf848"
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 c7e288c4f8..be5dbaedc1 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 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
19SRCREV_machine_qemux86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" 19SRCREV_machine_qemux86-64 ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
20SRCREV_machine_qemumips64 ?= "2468c20c15477ebe5ecd73c0e0162d7432149318" 20SRCREV_machine_qemumips64 ?= "2468c20c15477ebe5ecd73c0e0162d7432149318"
21SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d" 21SRCREV_machine ?= "3df4aae6074e94e794e27fe7f17451d9353cdf3d"
22SRCREV_meta ?= "806a4922a78c0f447e3d0f61fe6b3cce1e2c0acb" 22SRCREV_meta ?= "705457837e7ddd27e4e2ecf6d3dbd255b1aaf848"
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"