summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-01-11 12:59:51 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-19 11:11:58 +0000
commitc5f192e02f36b0926baf71ef51d8c774ae00cbc5 (patch)
treeb58713a2ef27b53f4a59a0d3175ce05b6a9ccecb /meta
parent8c111bb27c10891ac58d78300568b78f8f76269e (diff)
downloadpoky-c5f192e02f36b0926baf71ef51d8c774ae00cbc5.tar.gz
linux-yocto/5.14: fix arm 32bit -rt warnings
Integrating the following commit(s): f9e349e1745 preempt-rt.scc: arm should come after ftrace 25f5db372ac drivers-zynq.cfg: update CONFIG_NET_CADENCE option (From OE-Core rev: 182332fd5c2080942dd53862e76459677194347b) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 704720e28f67e880998d4dab85b366cb7f1a4ce3) Signed-off-by: Anuj Mittal <anuj.mittal@intel.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.14.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.14.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
index 7dcab51f01..6f22173b1e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "b18aaa90f5ce15336aacf4cc24c7a086aeb4bc84" 14SRCREV_machine ?= "b18aaa90f5ce15336aacf4cc24c7a086aeb4bc84"
15SRCREV_meta ?= "4f4ad2c8083408bb303e110090dcf5ca0ad447dd" 15SRCREV_meta ?= "f9e349e174542980f72dcd087445d0106b7a5e75"
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.14;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.14;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
index 23062df3b0..d44fac6094 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine:qemuarm ?= "159f57f8e022351d5193e51c02c951f2e255db1a" 18SRCREV_machine:qemuarm ?= "159f57f8e022351d5193e51c02c951f2e255db1a"
19SRCREV_machine ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" 19SRCREV_machine ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4"
20SRCREV_meta ?= "4f4ad2c8083408bb303e110090dcf5ca0ad447dd" 20SRCREV_meta ?= "f9e349e174542980f72dcd087445d0106b7a5e75"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.14.bb b/meta/recipes-kernel/linux/linux-yocto_5.14.bb
index aa7bf53682..b5be96b7c9 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.14.bb
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4"
23SRCREV_machine:qemux86-64 ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" 23SRCREV_machine:qemux86-64 ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4"
24SRCREV_machine:qemumips64 ?= "f6646a344afbf6cacc91cbeaaec4240b372dd192" 24SRCREV_machine:qemumips64 ?= "f6646a344afbf6cacc91cbeaaec4240b372dd192"
25SRCREV_machine ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" 25SRCREV_machine ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4"
26SRCREV_meta ?= "4f4ad2c8083408bb303e110090dcf5ca0ad447dd" 26SRCREV_meta ?= "f9e349e174542980f72dcd087445d0106b7a5e75"
27 27
28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
29# get the <version>/base branch, which is pure upstream -stable, and the same 29# get the <version>/base branch, which is pure upstream -stable, and the same