From c8561a0df6c510264169bb490fd1ed6cbb8a1f6c Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 20 Dec 2021 10:27:19 -0800 Subject: linux-xlnx: Move from 5.10 to 5.15 linux-xlnx sources now come from the 5.15 branch (xlnx_rebase_v5.15) yocto-kernel-cache now from the 5.15 branch as well Signed-off-by: Mark Hatle --- meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc | 6 +++--- meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2022.1.bb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-xilinx-bsp') diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc index 31cde189..147c53e2 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc @@ -4,16 +4,16 @@ LINUX_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}" PV = "${LINUX_VERSION}+git${SRCPV}" # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits -KBRANCH ?= "xlnx_rebase_v5.10" +KBRANCH ?= "xlnx_rebase_v5.15" SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}" FILESOVERRIDES:append = ":${XILINX_RELEASE_VERSION}" KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https;name=machine" -YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=yocto-kmeta" +YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=yocto-kmeta" SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}" SRCREV_machine ?= "${SRCREV}" -SRCREV_meta ?= "20b185f6b5afbad309747a7901786e0231dc8195" +SRCREV_meta ?= "eeb5d0c9dd5e2928835c633644426ee357fbce12" SRCREV_FORMAT = "machine" require recipes-kernel/linux/linux-yocto.inc diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2022.1.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2022.1.bb index 1c77e20b..6621d382 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2022.1.bb +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2022.1.bb @@ -1,6 +1,6 @@ -LINUX_VERSION = "5.10" +LINUX_VERSION = "5.15" KBRANCH="master" -SRCREV = "040493ea523aa1c81128ad447a82f58571b596ac" +SRCREV = "cae7610ec31c822f88f92322d17339ad2d1fc995" KCONF_AUDIT_LEVEL="0" -- cgit v1.2.3-54-g00ecf