diff options
author | Mark Hatle <mark.hatle@amd.com> | 2022-10-11 09:42:05 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2022-10-11 09:42:05 -0700 |
commit | 3bde26bfe3616b997eef95ec6411058961c81c62 (patch) | |
tree | 8da3755882e1d8371f026a32a30db6a683caadff | |
parent | 93c211cefd1d7bf700d2642a9df53a085c2a9bf1 (diff) | |
parent | 7009b62508816c4dc0c018ed2c512647e3e46b9a (diff) | |
download | meta-xilinx-3bde26bfe3616b997eef95ec6411058961c81c62.tar.gz |
Merge remote-tracking branch 'origin/honister' into kirkstone-next
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
18 files changed, 32 insertions, 34 deletions
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb index 7e423b9c..5ef2e6ac 100644 --- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb +++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2022.2.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | ATF_VERSION = "2.6" | 1 | ATF_VERSION = "2.6" |
2 | SRCREV = "85544c0159e216935e40174dadfed1296b6042bd" | 2 | SRCREV = "0897efd45ccad29a3dbab610578c70e3a52b2caa" |
3 | BRANCH = "xlnx_rebase_v2.6" | 3 | BRANCH = "xlnx_rebase_v2.6" |
4 | LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" | 4 | LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031" |
5 | 5 | ||
diff --git a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb index f80e1feb..fdf28f41 100644 --- a/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb +++ b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb | |||
@@ -10,8 +10,8 @@ DEPENDS += "openssl" | |||
10 | RDEPENDS:${PN} += "openssl" | 10 | 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 ?= "xlnx_rel_v2022.2" |
14 | SRCREV = "d890ba298685b73307a01a9dbcc8702f9afcdbcc" | 14 | SRCREV = "cf4ba93b99644dc4429ef633471a639e1382f0e7" |
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-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb index 6bd24fdf..2232b1da 100644 --- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb +++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb | |||
@@ -8,8 +8,8 @@ REPO ?= "git://github.com/Xilinx/dfx-mgr.git;protocol=https" | |||
8 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 8 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
9 | SRC_URI = "${REPO};${BRANCHARG}" | 9 | SRC_URI = "${REPO};${BRANCHARG}" |
10 | 10 | ||
11 | BRANCH = "master" | 11 | BRANCH = "xlnx_rel_v2022.2" |
12 | SRCREV = "b7fe333513edda99cd84f3a2d26e01aaf4bd5e02" | 12 | SRCREV = "bc06691eb35d7f0acb7c2508b6d050d77b0264a0" |
13 | SOMAJOR = "1" | 13 | SOMAJOR = "1" |
14 | SOMINOR = "0" | 14 | SOMINOR = "0" |
15 | SOVERSION = "${SOMAJOR}.${SOMINOR}" | 15 | SOVERSION = "${SOMAJOR}.${SOMINOR}" |
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb index 54f04d82..2c180561 100644 --- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb +++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb | |||
@@ -4,11 +4,11 @@ DESCRIPTION = "Xilinx libdfx Library and headers" | |||
4 | LICENSE = "MIT & GPL-2.0-or-later" | 4 | LICENSE = "MIT & GPL-2.0-or-later" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=94aba86aec117f003b958a52f019f1a7" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=94aba86aec117f003b958a52f019f1a7" |
6 | 6 | ||
7 | BRANCH ?= "master" | 7 | BRANCH ?= "xlnx_rel_v2022.2" |
8 | REPO ?= "git://github.com/Xilinx/libdfx.git;protocol=https" | 8 | REPO ?= "git://github.com/Xilinx/libdfx.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 | SRCREV = "cb36032844b3845ad28007404d0566184504c03f" | 11 | SRCREV = "f2b7bbca9d6936141024becfb92266600eeefc2b" |
12 | 12 | ||
13 | COMPATIBLE_MACHINE = "^$" | 13 | COMPATIBLE_MACHINE = "^$" |
14 | COMPATIBLE_MACHINE:zynqmp = "zynqmp" | 14 | COMPATIBLE_MACHINE:zynqmp = "zynqmp" |
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb index 0c7b4da9..3fdc3840 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2022.2.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | UBOOT_VERSION = "v2021.01" | 1 | UBOOT_VERSION = "v2021.01" |
2 | 2 | ||
3 | UBRANCH ?= "master" | 3 | UBRANCH ?= "xlnx_rebase_v2022.01" |
4 | 4 | ||
5 | SRCREV = "f2402773e2d82aafc08ac39c03f3bc430c014703" | 5 | SRCREV = "b31476685debf5512ed0d4e8000fa5167a22f530" |
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-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb index c7719866..6675ba3e 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2022.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | require qemu-devicetrees.inc | 2 | require qemu-devicetrees.inc |
3 | 3 | ||
4 | BRANCH ?= "master" | 4 | BRANCH ?= "xlnx_rel_v2022.2" |
5 | SRCREV ?= "42d0b7e24fbd1adc72fb2d0e70e06ff332278468" | 5 | SRCREV ?= "cf5d357e16c13ac447861f908e83951ffb7b4301" |
6 | 6 | ||
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc index 48b85f21..2aa54c74 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc | |||
@@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = " \ | |||
11 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" | 11 | DEPENDS = "glib-2.0 zlib pixman bison-native ninja-native meson-native" |
12 | 12 | ||
13 | XILINX_QEMU_VERSION ?= "v6.1.0" | 13 | XILINX_QEMU_VERSION ?= "v6.1.0" |
14 | BRANCH ?= "master" | 14 | BRANCH ?= "xlnx_rel_v2022.2" |
15 | SRCREV = "fbcb55665e9f5f91110ba2a44f62be9bc72752ee" | 15 | SRCREV = "74d70f8008bfbd1566c2eed3496a077a974de0d0" |
16 | 16 | ||
17 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | 17 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |
18 | 18 | ||
diff --git a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb index 4acce149..d1efc896 100644 --- a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb +++ b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb | |||
@@ -12,7 +12,7 @@ PROVIDES += "virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm" | |||
12 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | 12 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |
13 | 13 | ||
14 | REPO ?= "git://github.com/Xilinx/mali-userspace-binaries.git;protocol=https" | 14 | REPO ?= "git://github.com/Xilinx/mali-userspace-binaries.git;protocol=https" |
15 | BRANCH ?= "xlnx_rel_v2022.1" | 15 | BRANCH ?= "xlnx_rel_v2022.2" |
16 | SRCREV ?= "a1a22c9f03b20d8cb70b91727fe51c1db7f4b061" | 16 | SRCREV ?= "a1a22c9f03b20d8cb70b91727fe51c1db7f4b061" |
17 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 17 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
18 | 18 | ||
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb index ce898075..e9bf459e 100755 --- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb +++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb | |||
@@ -9,7 +9,7 @@ PV = "${XLNX_DP_VERSION}" | |||
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
12 | BRANCH ?= "master" | 12 | BRANCH ?= "xlnx_rel_v2022.2" |
13 | REPO ?= "git://github.com/xilinx/dp-modules.git;protocol=https" | 13 | REPO ?= "git://github.com/xilinx/dp-modules.git;protocol=https" |
14 | SRCREV ?= "c57b2ce95ee6c86f35caecbc7007644ff8f6d337" | 14 | SRCREV ?= "c57b2ce95ee6c86f35caecbc7007644ff8f6d337" |
15 | 15 | ||
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb index 418b4423..e94812da 100644 --- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb +++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb | |||
@@ -9,7 +9,7 @@ PV = "${XLNX_HDMI_VERSION}" | |||
9 | 9 | ||
10 | S = "${WORKDIR}/git" | 10 | S = "${WORKDIR}/git" |
11 | 11 | ||
12 | BRANCH ?= "xlnx_rel_v2022.1" | 12 | BRANCH ?= "xlnx_rel_v2022.2" |
13 | REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https" | 13 | REPO ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https" |
14 | SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e" | 14 | SRCREV = "25b6fe7a26a975be15c002b48cfd4c291486491e" |
15 | 15 | ||
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc index 2edebe8e..dc79151a 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc | |||
@@ -52,7 +52,6 @@ KBUILD_DEFCONFIG:zynqmp ?= "xilinx_defconfig" | |||
52 | KBUILD_DEFCONFIG:zynq ?= "xilinx_zynq_defconfig" | 52 | KBUILD_DEFCONFIG:zynq ?= "xilinx_zynq_defconfig" |
53 | KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig" | 53 | KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig" |
54 | KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig" | 54 | KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig" |
55 | KBUILD_DEFCONFIG:versal-net ?= "xilinx_versal_net_defconfig" | ||
56 | 55 | ||
57 | KERNEL_FEATURES:append:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}" | 56 | KERNEL_FEATURES:append:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}" |
58 | 57 | ||
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb index 3551fb8b..260224b8 100644 --- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb +++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2022.2.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | LINUX_VERSION = "5.15.36" | 1 | LINUX_VERSION = "5.15.36" |
2 | KBRANCH="xlnx_rebase_v5.15_LTS" | 2 | KBRANCH="xlnx_rebase_v5.15_LTS" |
3 | SRCREV = "2ddbacde6539be25b5717af5705a0d0009d6b2d3" | 3 | SRCREV = "19984dd147fa7fbb7cb14b17400263ad0925c189" |
4 | 4 | ||
5 | KCONF_AUDIT_LEVEL="0" | 5 | KCONF_AUDIT_LEVEL="0" |
6 | 6 | ||
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb index 0cb0c0ef..380fce12 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2022.2.bb | |||
@@ -11,9 +11,9 @@ S = "${WORKDIR}/git" | |||
11 | 11 | ||
12 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | 12 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |
13 | 13 | ||
14 | BRANCH = "xlnx_rel_v2022.1" | 14 | BRANCH = "xlnx_rel_v2022.2" |
15 | REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https" | 15 | REPO = "git://github.com/Xilinx/vcu-modules.git;protocol=https" |
16 | SRCREV = "9d2657550eccebccce08cacfcdd369367b9f6be4" | 16 | SRCREV = "b131e220285e06658b6ab27f9e19b1c592a55f3a" |
17 | 17 | ||
18 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 18 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
19 | SRC_URI = " \ | 19 | SRC_URI = " \ |
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb index b4460a38..5b958bee 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx_2022.2.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-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" | 7 | PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" |
8 | 8 | ||
9 | BRANCH ?= "xlnx_rel_v2022.1" | 9 | BRANCH ?= "xlnx_rel_v2022.2" |
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 = "b3308c608be7ed9250b9c6732f6e0a02b1a2e985" | 11 | SRCREV = "6752f5da88a8783f689ae762065295b89902d6d4" |
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-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb index 91f15cc2..24be1173 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx_2022.2.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-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" | 7 | PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or ''}+git${SRCPV}" |
8 | 8 | ||
9 | BRANCH ?= "xlnx_rel_v2022.1" | 9 | BRANCH ?= "xlnx_rel_v2022.2" |
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 = "5bf158af204b181f00ac009c8745557642ecfe5f" | 11 | SRCREV = "3c59dede1923a159a8db736ce0b4ab55633a2114" |
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-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb index fc9f34ca..6be9fe54 100644 --- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb +++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_2022.2.bb | |||
@@ -8,9 +8,9 @@ PV = "${XILINX_VCU_VERSION}-xilinx-v${@bb.parse.vars_from_file(d.getVar('FILE', | |||
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | 10 | ||
11 | BRANCH ?= "xlnx_rel_v2022.1" | 11 | BRANCH ?= "xlnx_rel_v2022.2" |
12 | REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https" | 12 | REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https" |
13 | SRCREV = "569f980527fd58f43baf16bd0b294bf8c7cdf963" | 13 | SRCREV = "3980c778d71fa51a15e89bf70fd8fb28d5cb12e0" |
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-core/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc index ba42fd5f..52bed585 100644 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc +++ b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc | |||
@@ -2,7 +2,7 @@ REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" | |||
2 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | 2 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" |
3 | SRC_URI = "${REPO};${BRANCHARG}" | 3 | SRC_URI = "${REPO};${BRANCHARG}" |
4 | 4 | ||
5 | BRANCH= "master" | 5 | BRANCH= "2022.2" |
6 | SRCREV= "910828b3abdbf66b10cb6efc952e75df64962340" | 6 | SRCREV= "43926231f7183688add2dccfd391b36a1f000bea" |
7 | PV = "202220.2.14.0" | 7 | PV = "202220.2.14.0" |
8 | 8 | ||
diff --git a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass index 403369b1..13837a3e 100644 --- a/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass +++ b/meta-xilinx-standalone/classes/xlnx-embeddedsw.bbclass | |||
@@ -4,21 +4,20 @@ ESW_VER ?= "${@bb.parse.vars_from_file(d.getVar('FILE', False),d)[1] or 'master' | |||
4 | REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" | 4 | REPO ??= "git://github.com/Xilinx/embeddedsw.git;protocol=https" |
5 | 5 | ||
6 | ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update" | 6 | ESW_BRANCH[2022.1] = "xlnx_rel_v2022.1_update" |
7 | ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2-next" | 7 | ESW_BRANCH[2022.2] = "xlnx_rel_v2022.2" |
8 | BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" | 8 | BRANCH ??= "${@d.getVarFlag('ESW_BRANCH', d.getVar('ESW_VER')) or '${ESW_VER}'}" |
9 | 9 | ||
10 | ESW_REV[2022.1] = "0cfb554e841f0837cabbb40a2481f5f7e5f2ddc0" | 10 | ESW_REV[2022.1] = "56d94a506fd9f80949f4cff08e13015928603f01" |
11 | ESW_REV[2022.2] = "72f6e3d45fb4dd9d6cd4a7581b935b39cf8ce96d" | 11 | ESW_REV[2022.2] = "5330a64c8efd14f0eef09befdbb8d3d738c33ec2" |
12 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" | 12 | SRCREV ??= "${@d.getVarFlag('ESW_REV', d.getVar('ESW_VER')) or '${AUTOREV}'}" |
13 | 13 | ||
14 | EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" | 14 | EMBEDDEDSW_BRANCHARG ?= "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}" |
15 | EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" | 15 | EMBEDDEDSW_SRCURI ?= "${REPO};${EMBEDDEDSW_BRANCHARG}" |
16 | 16 | ||
17 | LICENSE = "MIT" | 17 | LICENSE = "MIT" |
18 | LIC_FILES_CHKSUM[xlnx_rel_v2022.1] = 'e62cb7a722c4430999e0a55a7234035d' | ||
19 | LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d' | 18 | LIC_FILES_CHKSUM[xlnx_rel_v2022.1_update] = 'e62cb7a722c4430999e0a55a7234035d' |
20 | LIC_FILES_CHKSUM[xlnx_rel_v2022.2-next] = '7b5fc0b2a22e2882e1506436b3293e5d' | 19 | LIC_FILES_CHKSUM[xlnx_rel_v2022.2] = 'ce611484168a6000bd35df68fc4f4290' |
21 | LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" | 20 | LIC_FILES_CHKSUM ??= "file://license.txt;md5=${@d.getVarFlag('LIC_FILES_CHKSUM', d.getVar('BRANCH')) or '0'}" |
22 | 21 | ||
23 | SRC_URI = "${EMBEDDEDSW_SRCURI}" | 22 | SRC_URI = "${EMBEDDEDSW_SRCURI}" |
24 | PV = "${ESW_VER}+git${SRCPV}" | 23 | PV .= "+git${SRCPV}" |