summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2021-10-22 13:22:06 -0700
committerMark Hatle <mark.hatle@xilinx.com>2021-10-22 13:22:06 -0700
commitf2be6ce9ffce60e201b666a9412d0aa37fd7e0a3 (patch)
tree92fda42b4cfb938a18f7676e6af6f08ee81005e3 /meta-xilinx-bsp
parent0a261dc46294a94ebeaa33dfdaffeca9f2294150 (diff)
parentb9e0d5a296bd3dc407c36cec079c98488233ff0e (diff)
downloadmeta-xilinx-f2be6ce9ffce60e201b666a9412d0aa37fd7e0a3.tar.gz
Merge remote-tracking branch 'xilinx/rel-v2021.2' into 2022
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp')
-rw-r--r--meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb2
-rw-r--r--meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb2
-rwxr-xr-xmeta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb2
-rw-r--r--meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb4
-rw-r--r--meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb2
-rw-r--r--meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb2
6 files changed, 7 insertions, 7 deletions
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
index fffe8056..f69ed50c 100644
--- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
+++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.1.bb
@@ -1,5 +1,5 @@
1ATF_VERSION = "2.4" 1ATF_VERSION = "2.4"
2SRCREV = "799131a3b063f6f24f87baa74e46906c076aebcd" 2SRCREV = "9188496b9b23a665782bb3d2c2b9e3b29b7fb4e2"
3BRANCH = "xlnx_rebase_v2.4" 3BRANCH = "xlnx_rebase_v2.4"
4LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" 4LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
5 5
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 4c4c8ade..be8f114b 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
+++ b/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += "openssl"
11 11
12REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https" 12REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
13BRANCH ?= "xlnx_rel_v2021.2" 13BRANCH ?= "xlnx_rel_v2021.2"
14SRCREV = "f196bddc500dfb244aeabba264e66358c35d51dd" 14SRCREV = "5b6fe16a2bfd7ced4d90b70b0ba6fbf325e81e97"
15 15
16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" 16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
17SRC_URI = "${REPO};${BRANCHARG}" 17SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
index 75242299..37408751 100755
--- a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
+++ b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git"
11 11
12BRANCH ?= "master" 12BRANCH ?= "master"
13REPO ?= "git://github.com/xilinx/dp-modules.git;protocol=https" 13REPO ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
14SRCREV ?= "249a69434cef40308deda8460274d4d73a7e29f2" 14SRCREV ?= "46d4790c3d37ad4b878c5a1704df26edb56314f5"
15 15
16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" 16BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
17SRC_URI = "${REPO};${BRANCHARG}" 17SRC_URI = "${REPO};${BRANCHARG}"
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
index 6270a0f3..06949486 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
+++ b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
@@ -17,11 +17,11 @@ RDEPENDS_${PN} += " \
17 python3-humanfriendly \ 17 python3-humanfriendly \
18" 18"
19 19
20SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master" 20SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=v0.2021.x"
21 21
22LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8e5f5f691f01c9fdfa7a7f2d535be619" 22LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8e5f5f691f01c9fdfa7a7f2d535be619"
23 23
24SRCREV = "d2fedbb72c7e54bfb1f823cb17b28b69970b2808" 24SRCREV = "b17818f1e5f979fa1fee4452085139b15d65074d"
25 25
26S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
27 27
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
index 8ddd24bc..63f790c0 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
@@ -8,7 +8,7 @@ PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
8 8
9BRANCH ?= "master" 9BRANCH ?= "master"
10REPO ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https" 10REPO ?= "git://github.com/Xilinx/vcu-ctrl-sw.git;protocol=https"
11SRCREV = "3ae40aa1167f98be5e0cb3c23065d29860929b79" 11SRCREV = "372f702dc2983f42d219ce37000eae4b0515ec85"
12 12
13BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" 13BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
14SRC_URI = "${REPO};${BRANCHARG}" 14SRC_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 e9d4fdaa..c48c3101 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/git"
10 10
11BRANCH ?= "master" 11BRANCH ?= "master"
12REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https" 12REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
13SRCREV = "46f26a8fc8c660e247ab029aafcd951c400dd090" 13SRCREV = "17ef70e3a52b972f2c1f821f7b20d2f7af003711"
14 14
15BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" 15BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
16SRC_URI = "${REPO};${BRANCHARG}" 16SRC_URI = "${REPO};${BRANCHARG}"