From c5f192e02f36b0926baf71ef51d8c774ae00cbc5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 11 Jan 2022 12:59:51 -0500 Subject: 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 Signed-off-by: Richard Purdie (cherry picked from commit 704720e28f67e880998d4dab85b366cb7f1a4ce3) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.14.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') 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 () { } SRCREV_machine ?= "b18aaa90f5ce15336aacf4cc24c7a086aeb4bc84" -SRCREV_meta ?= "4f4ad2c8083408bb303e110090dcf5ca0ad447dd" +SRCREV_meta ?= "f9e349e174542980f72dcd087445d0106b7a5e75" 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.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" SRCREV_machine:qemuarm ?= "159f57f8e022351d5193e51c02c951f2e255db1a" SRCREV_machine ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" -SRCREV_meta ?= "4f4ad2c8083408bb303e110090dcf5ca0ad447dd" +SRCREV_meta ?= "f9e349e174542980f72dcd087445d0106b7a5e75" PV = "${LINUX_VERSION}+git${SRCPV}" 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" SRCREV_machine:qemux86-64 ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" SRCREV_machine:qemumips64 ?= "f6646a344afbf6cacc91cbeaaec4240b372dd192" SRCREV_machine ?= "9d5572038eacda2e2a86e3f743f35ec415319fb4" -SRCREV_meta ?= "4f4ad2c8083408bb303e110090dcf5ca0ad447dd" +SRCREV_meta ?= "f9e349e174542980f72dcd087445d0106b7a5e75" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- cgit v1.2.3-54-g00ecf