From 2afdcda5ccf445e17b5de539524be66e4cfb142e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 10 Mar 2020 15:13:48 -0700 Subject: linux-xlnx: cleanup and make yocto-kernel-cache available The following cleanups are done: - remove the invalid KBRANCH setting of xlnx_rebase_v4.19, this doesn't belong below the LINUX_VERSION = "5.4" variable, since it confuses users - explicitly set the SRCREV_FORMAT to MACHINE, since we are not using the kernel-cache SRCREV as a rebuild trigger - make the yocto-kernel-cache avialable by default, since there are re-usable kernel features which can be exploited in its directory structure. We use the latest (v5.4) branch and set the SRCREV Signed-off-by: Bruce Ashfield Signed-off-by: Mark Hatle --- meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc | 7 +++++-- meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.1.bb | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc index b0b0c6a3..ec50e2d0 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc @@ -8,10 +8,13 @@ KBRANCH ?= "" SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}" FILESOVERRIDES_append = ":${XILINX_RELEASE_VERSION}" -KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https" -SRC_URI = "${KERNELURI};${SRCBRANCHARG}" +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.4;destsuffix=yocto-kmeta" +SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}" SRCREV_machine ?= "${SRCREV}" +SRCREV_meta ?= "b8c82ba37370e4698ff0c42f3e54b8b4f2fb4ac0" +SRCREV_FORMAT = "machine" require recipes-kernel/linux/linux-yocto.inc require linux-microblaze.inc diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.1.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.1.bb index 2b8763a9..aefc564a 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.1.bb +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2020.1.bb @@ -1,5 +1,4 @@ LINUX_VERSION = "5.4" -KBRANCH ?= "xlnx_rebase_v4.19" SRCREV ?= "b983d5fd71d4feaf494cdbe0593ecc29ed471cb8" include linux-xlnx.inc -- cgit v1.2.3-54-g00ecf