diff options
| author | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2020-05-18 14:40:05 -0700 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2020-05-18 22:48:53 -0700 |
| commit | 9437b7e0ef69c1d30073d64c3a8f58e0cb75d3c5 (patch) | |
| tree | d015816f89b9ed06f505ffa9e9f702db8567b168 | |
| parent | 6928659cb126bcb82e0d47ab59e91db73b60c717 (diff) | |
| download | meta-xilinx-9437b7e0ef69c1d30073d64c3a8f58e0cb75d3c5.tar.gz | |
Update commit ids for 2020.1 release
Update commit ids and branches for atf,u-boot,linux-xlnx,vcu
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
14 files changed, 27 insertions, 27 deletions
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index 074e26b8..87a1bbc4 100644 --- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | DESCRIPTION = "ARM Trusted Firmware" | 1 | DESCRIPTION = "ARM Trusted Firmware" |
| 2 | 2 | ||
| 3 | LICENSE = "BSD" | 3 | LICENSE = "BSD" |
| 4 | LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" | 4 | LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" |
| 5 | 5 | ||
| 6 | PROVIDES = "virtual/arm-trusted-firmware" | 6 | PROVIDES = "virtual/arm-trusted-firmware" |
| 7 | 7 | ||
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2020.1.bb b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2020.1.bb index a7ba1098..1d94c518 100644 --- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2020.1.bb +++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2020.1.bb | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ATF_VERSION = "2.0" | 1 | ATF_VERSION = "2.0" |
| 2 | BRANCH ?= "master" | 2 | BRANCH ?= "xlnx_rebase_v2.2" |
| 3 | SRCREV ?= "713dace94b259845fd8eede11061fbd8f039011e" | 3 | SRCREV ?= "5918e656ef29dbdf234a6324ec85bc8a68eca113" |
| 4 | 4 | ||
| 5 | include arm-trusted-firmware.inc | 5 | include arm-trusted-firmware.inc |
| 6 | 6 | ||
diff --git a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb b/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb index 16c89c46..4904a8e0 100644 --- a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb +++ b/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Building and installing bootgen" | |||
| 2 | DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images" | 2 | DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stitch binary files together and generate device boot images" |
| 3 | 3 | ||
| 4 | LICENSE = "Apache-2.0" | 4 | LICENSE = "Apache-2.0" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=c979df673927004a489691fc457facff" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=be5410bcde8eb6481a6e5d3b22e0740b" |
| 6 | 6 | ||
| 7 | S = "${WORKDIR}/git" | 7 | S = "${WORKDIR}/git" |
| 8 | 8 | ||
| @@ -11,7 +11,7 @@ RDEPENDS_${PN} += "openssl" | |||
| 11 | 11 | ||
| 12 | REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https" | 12 | REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https" |
| 13 | BRANCH ?= "master" | 13 | BRANCH ?= "master" |
| 14 | SRCREV ?= "f9f477adf243fa40bc8c7316a7aac37a0efd426d" | 14 | SRCREV ?= "bb38995468d8c830cbbfc5062e903961444c0a3c" |
| 15 | 15 | ||
| 16 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 16 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
| 17 | SRC_URI = "${REPO};${BRANCHARG}" | 17 | SRC_URI = "${REPO};${BRANCHARG}" |
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb index 03ab6fb5..0eb66c8a 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2020.1.bb | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | UBOOT_VERSION = "v2019.01" | 1 | UBOOT_VERSION = "v2020.01" |
| 2 | 2 | ||
| 3 | UBRANCH ?= "master" | 3 | UBRANCH ?= "xlnx_rebase_v2020.01" |
| 4 | 4 | ||
| 5 | SRCREV ?= "dc61275b1d505f6a236de1c5b0f35485914d2bcc" | 5 | SRCREV ?= "86c84c0d0f916ec00d5d76a32dc9372a25429ca9" |
| 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-devtools/qemu/qemu-devicetrees_2020.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2020.1.bb index 26914f5a..235ca59e 100644 --- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2020.1.bb +++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2020.1.bb | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | require qemu-devicetrees.inc | 1 | require qemu-devicetrees.inc |
| 2 | 2 | ||
| 3 | BRANCH ?= "master" | 3 | BRANCH ?= "branch/xilinx-v2020.1" |
| 4 | SRCREV ?= "${AUTOREV}" | 4 | SRCREV ?= "4978ef3833f2a6a3c62075759605c683d75f6276" |
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc index 79e03fdf..3bd75d7a 100644 --- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc | |||
| @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \ | |||
| 11 | DEPENDS = "glib-2.0 zlib pixman" | 11 | DEPENDS = "glib-2.0 zlib pixman" |
| 12 | 12 | ||
| 13 | XILINX_QEMU_VERSION ?= "v4.1.50" | 13 | XILINX_QEMU_VERSION ?= "v4.1.50" |
| 14 | BRANCH ?= "master" | 14 | BRANCH ?= "branch/xilinx-v2020.1" |
| 15 | SRCREV ?= "${AUTOREV}" | 15 | SRCREV ?= "d1f07588c0128a1f98f8b1953c25e7827fe161e4" |
| 16 | 16 | ||
| 17 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 17 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
| 18 | 18 | ||
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc index 6cb7cb90..73f85ddc 100644 --- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc | |||
| @@ -4,7 +4,7 @@ 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 ?= "" | 7 | KBRANCH ?= "xlnx_rebase_v5.4" |
| 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}" |
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 aefc564a..bad9f9a1 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,5 @@ | |||
| 1 | LINUX_VERSION = "5.4" | 1 | LINUX_VERSION = "5.4" |
| 2 | SRCREV ?= "b983d5fd71d4feaf494cdbe0593ecc29ed471cb8" | 2 | SRCREV ?= "22b71b41620dac13c69267d2b7898ebfb14c954e" |
| 3 | 3 | ||
| 4 | include linux-xlnx.inc | 4 | include linux-xlnx.inc |
| 5 | 5 | ||
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb index 440e521b..d7208257 100644 --- a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb +++ b/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb | |||
| @@ -9,9 +9,9 @@ PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" | |||
| 9 | 9 | ||
| 10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
| 11 | 11 | ||
| 12 | BRANCH ?= "release-2019.2" | 12 | BRANCH ?= "release-2020.1" |
| 13 | REPO ?= "git://github.com/xilinx/vcu-modules.git;protocol=https" | 13 | REPO ?= "git://github.com/xilinx/vcu-modules.git;protocol=https" |
| 14 | SRCREV ?= "d4b46f2ee10e5d13609ca982d8d8bae662468837" | 14 | SRCREV ?= "38827a9172cfb1f0243547c04b2babc045d411ee" |
| 15 | 15 | ||
| 16 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 16 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
| 17 | SRC_URI = "${REPO};${BRANCHARG}" | 17 | SRC_URI = "${REPO};${BRANCHARG}" |
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb index a79e4d36..49b8ef6f 100644 --- a/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb +++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb | |||
| @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493" | |||
| 6 | XILINX_VCU_VERSION = "1.0.0" | 6 | XILINX_VCU_VERSION = "1.0.0" |
| 7 | PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" | 7 | PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" |
| 8 | 8 | ||
| 9 | BRANCH ?= "release-2019.2" | 9 | BRANCH ?= "release-2020.1" |
| 10 | REPO ?= "git://github.com/xilinx/vcu-omx-il.git;protocol=https" | 10 | REPO ?= "git://github.com/xilinx/vcu-omx-il.git;protocol=https" |
| 11 | SRCREV ?= "9bbb40e3ceddd9e166d1d97aa4ac380459166344" | 11 | SRCREV ?= "b5ffa7ec36814cb52c1616dffea2c4ced51fee19" |
| 12 | 12 | ||
| 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
| 14 | SRC_URI = "${REPO};${BRANCHARG}" | 14 | SRC_URI = "${REPO};${BRANCHARG}" |
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb index 08be1f08..54fe19a9 100644 --- a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb +++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb | |||
| @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493" | |||
| 6 | XILINX_VCU_VERSION = "1.0.0" | 6 | XILINX_VCU_VERSION = "1.0.0" |
| 7 | PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" | 7 | PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" |
| 8 | 8 | ||
| 9 | BRANCH ?= "release-2019.2" | 9 | BRANCH ?= "release-2020.1" |
| 10 | REPO ?= "git://github.com/xilinx/vcu-ctrl-sw.git;protocol=https" | 10 | REPO ?= "git://github.com/xilinx/vcu-ctrl-sw.git;protocol=https" |
| 11 | SRCREV ?= "f3001b44eeaf770cbd9f95d2cfd0b02d3f65b2d3" | 11 | SRCREV ?= "8ad2b1323bdc98d580360e1a01006d70625c4e65" |
| 12 | 12 | ||
| 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
| 14 | SRC_URI = "${REPO};${BRANCHARG}" | 14 | SRC_URI = "${REPO};${BRANCHARG}" |
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb index a9f55e9b..e29bfb79 100644 --- a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb +++ b/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb | |||
| @@ -8,9 +8,9 @@ PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" | |||
| 8 | 8 | ||
| 9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
| 10 | 10 | ||
| 11 | BRANCH ?= "release-2019.2" | 11 | BRANCH ?= "release-2020.1" |
| 12 | REPO ?= "git://github.com/xilinx/vcu-firmware.git;protocol=https" | 12 | REPO ?= "git://github.com/xilinx/vcu-firmware.git;protocol=https" |
| 13 | SRCREV ?= "29ab982965b797b1c9b567faba47378578398f4a" | 13 | SRCREV ?= "7ecfd476deb054f354791cc1300ccba069e234f5" |
| 14 | 14 | ||
| 15 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 15 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
| 16 | SRC_URI = "${REPO};${BRANCHARG}" | 16 | SRC_URI = "${REPO};${BRANCHARG}" |
diff --git a/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb index 8cff09c6..4b6b9fc1 100644 --- a/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb +++ b/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb | |||
| @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=fa343562af4b9b922b8d7fe7b0b6d000 \ | |||
| 8 | file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 8 | file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
| 9 | file://runtime_src/core/pcie/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 " | 9 | file://runtime_src/core/pcie/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 " |
| 10 | 10 | ||
| 11 | BRANCH ?= "2019.2" | 11 | BRANCH ?= "2020.1" |
| 12 | REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" | 12 | REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" |
| 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 13 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
| 14 | SRC_URI = "${REPO};${BRANCHARG}" | 14 | SRC_URI = "${REPO};${BRANCHARG}" |
| 15 | 15 | ||
| 16 | PV = "2.2.0+git${SRCPV}" | 16 | PV = "2.2.0+git${SRCPV}" |
| 17 | SRCREV ?= "7e3540d2707443d8c824669ef4272b33ce2f9ba4" | 17 | SRCREV ?= "a48f247fffc78109707d53e9e2b8966233caec51" |
| 18 | 18 | ||
| 19 | S = "${WORKDIR}/git/src" | 19 | S = "${WORKDIR}/git/src" |
| 20 | 20 | ||
diff --git a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb b/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb index 94aa09cd..a4ce6575 100644 --- a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb +++ b/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb | |||
| @@ -2,15 +2,15 @@ SUMMARY = "Xilinx Runtime(XRT) driver module" | |||
| 2 | DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" | 2 | DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" |
| 3 | 3 | ||
| 4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" |
| 6 | 6 | ||
| 7 | BRANCH ?= "2019.2" | 7 | BRANCH ?= "2020.1" |
| 8 | REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" | 8 | REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" |
| 9 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 9 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
| 10 | SRC_URI = "${REPO};${BRANCHARG}" | 10 | SRC_URI = "${REPO};${BRANCHARG}" |
| 11 | 11 | ||
| 12 | PV = "2.2.0+git${SRCPV}" | 12 | PV = "2.2.0+git${SRCPV}" |
| 13 | SRCREV ?= "7e3540d2707443d8c824669ef4272b33ce2f9ba4" | 13 | SRCREV ?= "a48f247fffc78109707d53e9e2b8966233caec51" |
| 14 | 14 | ||
| 15 | S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" | 15 | S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" |
| 16 | 16 | ||
