diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-20 10:27:19 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-20 10:28:42 -0800 |
commit | c8561a0df6c510264169bb490fd1ed6cbb8a1f6c (patch) | |
tree | 8821dbb2b9280821390023e6b7ec770af3d4415f /meta-xilinx-bsp | |
parent | 98df4dbca72e42fbce8fcce1c91c4ec8e9e8b3d5 (diff) | |
download | meta-xilinx-c8561a0df6c510264169bb490fd1ed6cbb8a1f6c.tar.gz |
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 <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp')
-rw-r--r-- | meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc | 6 | ||||
-rw-r--r-- | meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2022.1.bb | 4 |
2 files changed, 5 insertions, 5 deletions
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}" | |||
4 | PV = "${LINUX_VERSION}+git${SRCPV}" | 4 | PV = "${LINUX_VERSION}+git${SRCPV}" |
5 | 5 | ||
6 | # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits | 6 | # Sources, by default allow for the use of SRCREV pointing to orphaned tags/commits |
7 | KBRANCH ?= "xlnx_rebase_v5.10" | 7 | KBRANCH ?= "xlnx_rebase_v5.15" |
8 | SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}" | 8 | SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}" |
9 | 9 | ||
10 | FILESOVERRIDES:append = ":${XILINX_RELEASE_VERSION}" | 10 | FILESOVERRIDES:append = ":${XILINX_RELEASE_VERSION}" |
11 | KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https;name=machine" | 11 | KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https;name=machine" |
12 | YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=yocto-kmeta" | 12 | YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=yocto-kmeta" |
13 | SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}" | 13 | SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}" |
14 | 14 | ||
15 | SRCREV_machine ?= "${SRCREV}" | 15 | SRCREV_machine ?= "${SRCREV}" |
16 | SRCREV_meta ?= "20b185f6b5afbad309747a7901786e0231dc8195" | 16 | SRCREV_meta ?= "eeb5d0c9dd5e2928835c633644426ee357fbce12" |
17 | SRCREV_FORMAT = "machine" | 17 | SRCREV_FORMAT = "machine" |
18 | 18 | ||
19 | require recipes-kernel/linux/linux-yocto.inc | 19 | 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 @@ | |||
1 | LINUX_VERSION = "5.10" | 1 | LINUX_VERSION = "5.15" |
2 | KBRANCH="master" | 2 | KBRANCH="master" |
3 | SRCREV = "040493ea523aa1c81128ad447a82f58571b596ac" | 3 | SRCREV = "cae7610ec31c822f88f92322d17339ad2d1fc995" |
4 | 4 | ||
5 | KCONF_AUDIT_LEVEL="0" | 5 | KCONF_AUDIT_LEVEL="0" |
6 | 6 | ||