summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-01-11 12:59:52 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-12 21:09:01 +0000
commit85afa089001a59b78487cb93820ee0095d283ab5 (patch)
tree2dae1bca88b269da6217be6c1ce7feb49fcb8882 /meta
parenta9f8fc86f3d4538681ce5b48d2ca170670815078 (diff)
downloadpoky-85afa089001a59b78487cb93820ee0095d283ab5.tar.gz
linux-yocto/5.15: fix arm 32bit -rt warnings
Integrating the following commit(s) to: 41e5b01b59c preempt-rt.scc: arm should come after ftrace 6fe0a923260 drivers-zynq.cfg: update CONFIG_NET_CADENCE option (From OE-Core rev: 1bc502f676d1f9a37c6869d154e75fbf60957e72) 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.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.15.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index ea50600972..3d600acde6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "11651ef1c948677add527afd54c9f960a33884c8" 14SRCREV_machine ?= "11651ef1c948677add527afd54c9f960a33884c8"
15SRCREV_meta ?= "c5d4d9353dad22aa75f6192cd4ff15cf14c69a68" 15SRCREV_meta ?= "41e5b01b59c69ac58f588bc7dc7d2e2cb80d82e1"
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.15;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index bf7e39b630..6f5bf33d74 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine:qemuarm ?= "0f7af34df7639ad8c513e6698d5f1a6081b55f77" 18SRCREV_machine:qemuarm ?= "0f7af34df7639ad8c513e6698d5f1a6081b55f77"
19SRCREV_machine ?= "721ba67b41253d17c7bb71aadae3e7a44bf4d22c" 19SRCREV_machine ?= "721ba67b41253d17c7bb71aadae3e7a44bf4d22c"
20SRCREV_meta ?= "c5d4d9353dad22aa75f6192cd4ff15cf14c69a68" 20SRCREV_meta ?= "41e5b01b59c69ac58f588bc7dc7d2e2cb80d82e1"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index cdb7be779a..b06184a2ee 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "721ba67b41253d17c7bb71aadae3e7a44bf4d22c"
23SRCREV_machine:qemux86-64 ?= "721ba67b41253d17c7bb71aadae3e7a44bf4d22c" 23SRCREV_machine:qemux86-64 ?= "721ba67b41253d17c7bb71aadae3e7a44bf4d22c"
24SRCREV_machine:qemumips64 ?= "723cf54aff5756af97663c4a8a7bf0754d0d940e" 24SRCREV_machine:qemumips64 ?= "723cf54aff5756af97663c4a8a7bf0754d0d940e"
25SRCREV_machine ?= "721ba67b41253d17c7bb71aadae3e7a44bf4d22c" 25SRCREV_machine ?= "721ba67b41253d17c7bb71aadae3e7a44bf4d22c"
26SRCREV_meta ?= "c5d4d9353dad22aa75f6192cd4ff15cf14c69a68" 26SRCREV_meta ?= "41e5b01b59c69ac58f588bc7dc7d2e2cb80d82e1"
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