From 8a1fc21cf0719fb785b2c682c6b42151ab11a54d Mon Sep 17 00:00:00 2001 From: Sai Hari Chandana Kalluri Date: Thu, 27 May 2021 20:59:47 -0700 Subject: Update commit id for 2021-integration Signed-off-by: Sai Hari Chandana Kalluri --- meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.1.bb | 4 ++-- meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.1.bb | 4 ++-- meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.1.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.1.bb index 839868f9..2aa1f5a7 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.1.bb +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.1.bb @@ -1,8 +1,8 @@ UBOOT_VERSION = "v2020.01" -UBRANCH ?= "master" +UBRANCH ?= "xlnx_rebase_v2021.01" -SRCREV = "917179090100fb0a03aa5afbaaf9fe07e786d117" +SRCREV = "bdded0d4086b6d2db5c13a06743939fe04dbba90" include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.1.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.1.bb index 8478ca8b..2490a174 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.1.bb +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.1.bb @@ -1,6 +1,6 @@ LINUX_VERSION = "5.10" -KBRANCH="master" -SRCREV = "85077014c1d2f88d7ab1c10ec7643c73c4da66ac" +KBRANCH="xlnx_rebase_v5.10" +SRCREV = "f5e7411defe2b6e69fe0d933150f63f6292d588c" KCONF_AUDIT_LEVEL="0" diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index c1a2ebaf..b6c6143b 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass @@ -15,8 +15,8 @@ ESW_REV[2019.1] = "26c14d9861010a0e3a55c73fb79efdb816eb42ca" ESW_REV[2019.2] = "e8db5fb118229fdc621e0ec7848641a23bf60998" ESW_REV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd" ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" -ESW_REV[2021.1] = "c97df912de4f1e574a3b17f9796fa8ab016c9221" -ESW_REV[git] = "c97df912de4f1e574a3b17f9796fa8ab016c9221" +ESW_REV[2021.1] = "70f81521b0420c4237ceb7de91196613eada0e9b" +ESW_REV[git] = "70f81521b0420c4237ceb7de91196613eada0e9b" SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" -- cgit v1.2.3-54-g00ecf