diff options
| author | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2021-05-27 20:59:47 -0700 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2021-07-14 15:01:47 -0700 |
| commit | 8a1fc21cf0719fb785b2c682c6b42151ab11a54d (patch) | |
| tree | 4f1c0f17bb3173db5f4d79a66371a9cc33d0a2b5 | |
| parent | 3560b31db50cbb4b22e4017f836b30d69f6a8e4d (diff) | |
| download | meta-xilinx-8a1fc21cf0719fb785b2c682c6b42151ab11a54d.tar.gz | |
Update commit id for 2021-integration
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
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 @@ | |||
| 1 | UBOOT_VERSION = "v2020.01" | 1 | UBOOT_VERSION = "v2020.01" |
| 2 | 2 | ||
| 3 | UBRANCH ?= "master" | 3 | UBRANCH ?= "xlnx_rebase_v2021.01" |
| 4 | 4 | ||
| 5 | SRCREV = "917179090100fb0a03aa5afbaaf9fe07e786d117" | 5 | SRCREV = "bdded0d4086b6d2db5c13a06743939fe04dbba90" |
| 6 | 6 | ||
| 7 | include u-boot-xlnx.inc | 7 | include u-boot-xlnx.inc |
| 8 | include u-boot-spl-zynq-init.inc | 8 | 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 @@ | |||
| 1 | LINUX_VERSION = "5.10" | 1 | LINUX_VERSION = "5.10" |
| 2 | KBRANCH="master" | 2 | KBRANCH="xlnx_rebase_v5.10" |
| 3 | SRCREV = "85077014c1d2f88d7ab1c10ec7643c73c4da66ac" | 3 | SRCREV = "f5e7411defe2b6e69fe0d933150f63f6292d588c" |
| 4 | 4 | ||
| 5 | KCONF_AUDIT_LEVEL="0" | 5 | KCONF_AUDIT_LEVEL="0" |
| 6 | 6 | ||
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" | |||
| 15 | ESW_REV[2019.2] = "e8db5fb118229fdc621e0ec7848641a23bf60998" | 15 | ESW_REV[2019.2] = "e8db5fb118229fdc621e0ec7848641a23bf60998" |
| 16 | ESW_REV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd" | 16 | ESW_REV[2020.1] = "338150ab3628a1ea6b06e964b16e712b131882dd" |
| 17 | ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" | 17 | ESW_REV[2020.2] = "2516d5ed8161e16c2813b0e8e4ceac693f23de5c" |
| 18 | ESW_REV[2021.1] = "c97df912de4f1e574a3b17f9796fa8ab016c9221" | 18 | ESW_REV[2021.1] = "70f81521b0420c4237ceb7de91196613eada0e9b" |
| 19 | ESW_REV[git] = "c97df912de4f1e574a3b17f9796fa8ab016c9221" | 19 | ESW_REV[git] = "70f81521b0420c4237ceb7de91196613eada0e9b" |
| 20 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" | 20 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" |
| 21 | 21 | ||
| 22 | EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" | 22 | EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" |
