summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaewon Lee <jaewon.lee@xilinx.com>2019-02-12 11:01:29 -0800
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-08-15 17:04:35 -0700
commit1f5c9c1b1379c9661f947ef4d53970871d2a21d4 (patch)
treeb2c088d6f817133f3eac383eebf7e73671502ffb
parentd4ea4fc1efa9c2d1b5fcf1f11d925de75a211a8c (diff)
downloadmeta-xilinx-1f5c9c1b1379c9661f947ef4d53970871d2a21d4.tar.gz
Update recipes for Xilinx v2019.1 release
Update components for 2019.1 release - u-boot-xlnx - linux-xlnx - arm-trusted-firmware - QEMU - recipes-multimedia/vcu - xrt and zocl - pmu-firmware Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc2
-rw-r--r--meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.3.bb7
-rw-r--r--meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2019.1.bb7
-rw-r--r--meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2019.1.bb (renamed from meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2018.3.bb)0
-rw-r--r--meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2019.1/microblaze-kc705-Convert-microblaze-generic-to-k.patch (renamed from meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2018.3/microblaze-kc705-Convert-microblaze-generic-to-k.patch)0
-rw-r--r--meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2019.1.bb (renamed from meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.3.bb)8
-rw-r--r--meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2018.3.bb6
-rw-r--r--meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2019.1.bb6
-rw-r--r--meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2018.3.bb6
-rw-r--r--meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2019.1.bb6
-rw-r--r--meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc1
-rw-r--r--meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2018.3.bb7
-rw-r--r--meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2019.1.bb7
-rw-r--r--meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb6
-rw-r--r--meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb6
-rw-r--r--meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb6
-rw-r--r--meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb6
-rw-r--r--meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb4
-rw-r--r--meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb2
-rw-r--r--meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch (renamed from meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch)0
-rw-r--r--meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch (renamed from meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch)0
-rw-r--r--meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch (renamed from meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch)0
-rw-r--r--meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0004-minized-wifi-bluetooth.cfg (renamed from meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0004-minized-wifi-bluetooth.cfg)0
-rw-r--r--meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2019.1.bbappend (renamed from meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2018.3.bbappend)0
-rw-r--r--meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.1.bb (renamed from meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2018.3.bb)9
25 files changed, 50 insertions, 52 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 1b428195..785f915e 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
@@ -13,7 +13,7 @@ S = "${WORKDIR}/git"
13B = "${WORKDIR}/build" 13B = "${WORKDIR}/build"
14 14
15XILINX_RELEASE_VERSION ?= "" 15XILINX_RELEASE_VERSION ?= ""
16ATF_VERSION ?= "1.4" 16ATF_VERSION ?= "2.0"
17ATF_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}" 17ATF_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}"
18PV = "${ATF_VERSION}${ATF_VERSION_EXTENSION}+git${SRCPV}" 18PV = "${ATF_VERSION}${ATF_VERSION_EXTENSION}+git${SRCPV}"
19 19
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.3.bb b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.3.bb
deleted file mode 100644
index 8c8a5d00..00000000
--- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1ATF_VERSION = "1.5"
2XILINX_RELEASE_VERSION = "v2018.3"
3BRANCH ?= "master"
4SRCREV ?= "08560c36ea5b6f48b962cb4bd9a79b35bb3d95ce"
5
6include arm-trusted-firmware.inc
7
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2019.1.bb b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2019.1.bb
new file mode 100644
index 00000000..64cbddc4
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2019.1.bb
@@ -0,0 +1,7 @@
1ATF_VERSION = "2.0"
2XILINX_RELEASE_VERSION = "v2019.1"
3BRANCH ?= "master"
4SRCREV ?= "80d1c79007fda42d4cc0be31b185a1da5799cd4d"
5
6include arm-trusted-firmware.inc
7
diff --git a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2018.3.bb b/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2019.1.bb
index 6a2ca7cc..6a2ca7cc 100644
--- a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2018.3.bb
+++ b/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2019.1.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2018.3/microblaze-kc705-Convert-microblaze-generic-to-k.patch b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2019.1/microblaze-kc705-Convert-microblaze-generic-to-k.patch
index 7e25f87c..7e25f87c 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2018.3/microblaze-kc705-Convert-microblaze-generic-to-k.patch
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx/v2019.1/microblaze-kc705-Convert-microblaze-generic-to-k.patch
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.3.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2019.1.bb
index c87672e9..3377635d 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.3.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2019.1.bb
@@ -1,9 +1,9 @@
1UBOOT_VERSION = "v2018.01" 1UBOOT_VERSION = "v2019.01"
2XILINX_RELEASE_VERSION = "v2018.3" 2XILINX_RELEASE_VERSION = "v2019.1"
3 3
4UBRANCH ?= "master" 4UBRANCH ?= "master"
5 5
6SRCREV ?= "d8fc4b3b70bccf1577dab69f6ddfd4ada9a93bac" 6SRCREV ?= "d895ac5e94815d4b45dcf09d4752c5c2334a51db"
7 7
8include u-boot-xlnx.inc 8include u-boot-xlnx.inc
9include u-boot-spl-zynq-init.inc 9include u-boot-spl-zynq-init.inc
@@ -11,7 +11,7 @@ include u-boot-spl-zynq-init.inc
11SRC_URI_append_kc705-microblazeel = " file://microblaze-kc705-Convert-microblaze-generic-to-k.patch" 11SRC_URI_append_kc705-microblazeel = " file://microblaze-kc705-Convert-microblaze-generic-to-k.patch"
12 12
13LICENSE = "GPLv2+" 13LICENSE = "GPLv2+"
14LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c" 14LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897"
15 15
16# u-boot-xlnx has support for these 16# u-boot-xlnx has support for these
17HAS_PLATFORM_INIT ?= " \ 17HAS_PLATFORM_INIT ?= " \
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2018.3.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2018.3.bb
deleted file mode 100644
index 6f8eda2f..00000000
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2018.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require qemu-devicetrees.inc
2
3XILINX_RELEASE_VERSION = "v2018.3"
4
5BRANCH ?= "master"
6SRCREV ?= "e3e40b8829894a479c7d7380fc8137886645dda8"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2019.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2019.1.bb
new file mode 100644
index 00000000..06481660
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2019.1.bb
@@ -0,0 +1,6 @@
1require qemu-devicetrees.inc
2
3XILINX_RELEASE_VERSION = "v2019.1"
4
5BRANCH ?= "branch/xilinx-v2019.1"
6SRCREV ?= "445406ef4d06303f00387f7d81e8718255336fd0"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2018.3.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2018.3.bb
deleted file mode 100644
index 57547dff..00000000
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2018.3.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require qemu-xilinx.inc
2
3XILINX_RELEASE_VERSION = "v2018.3"
4XILINX_QEMU_VERSION ?= "v2.11.0"
5BRANCH ?= "master"
6SRCREV ?= "f70bd86859c7a1a075ac864b4765168f821f1aae"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2019.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2019.1.bb
new file mode 100644
index 00000000..2dcf35b5
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2019.1.bb
@@ -0,0 +1,6 @@
1require qemu-xilinx.inc
2
3XILINX_RELEASE_VERSION = "v2019.1"
4XILINX_QEMU_VERSION ?= "v2.11.1"
5BRANCH ?= "branch/xilinx-v2019.1"
6SRCREV ?= "5f38ea92fb697b94ad43f01fe162f3ed6e6b0e16"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
index 5de6c9c2..54ec3f21 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
@@ -17,6 +17,7 @@ require recipes-kernel/linux/linux-yocto.inc
17require linux-microblaze.inc 17require linux-microblaze.inc
18 18
19DESCRIPTION = "Xilinx Kernel" 19DESCRIPTION = "Xilinx Kernel"
20LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
20 21
21EXTKERNELSRC = "${@'1' if d.getVar('EXTERNALSRC') else ''}" 22EXTKERNELSRC = "${@'1' if d.getVar('EXTERNALSRC') else ''}"
22 23
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2018.3.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2018.3.bb
deleted file mode 100644
index ade13e32..00000000
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2018.3.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1LINUX_VERSION = "4.14"
2XILINX_RELEASE_VERSION = "v2018.3"
3KBRANCH ?= "xlnx_rebase_v4.14"
4SRCREV ?= "eeab73d1207d6fc2082776c954eb19fd7290bfbe"
5
6include linux-xlnx.inc
7
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2019.1.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2019.1.bb
new file mode 100644
index 00000000..5bac31e9
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2019.1.bb
@@ -0,0 +1,7 @@
1LINUX_VERSION = "4.19"
2XILINX_RELEASE_VERSION = "v2019.1"
3KBRANCH ?= "xlnx_rebase_v4.19"
4SRCREV ?= "9811303824b66a8db9a8ec61b570879336a9fde5"
5
6include linux-xlnx.inc
7
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 8d1380f0..3c13c697 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
@@ -5,14 +5,14 @@ LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a" 5LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
6 6
7XILINX_VCU_VERSION = "1.0.0" 7XILINX_VCU_VERSION = "1.0.0"
8XILINX_RELEASE_VERSION = "2018.3" 8XILINX_RELEASE_VERSION = "v2019.1"
9PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" 9PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13BRANCH ?= "master" 13BRANCH ?= "master-rel-2019.1"
14REPO ?= "git://github.com/xilinx/vcu-modules.git;protocol=https" 14REPO ?= "git://github.com/xilinx/vcu-modules.git;protocol=https"
15SRCREV ?= "f6a9093ec32ee97a2df065aee8b8e676c2024f01" 15SRCREV ?= "13a8e5b3f614d94081481a808aa8d4bd00b26d76"
16 16
17BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" 17BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
18SRC_URI = "${REPO};${BRANCHARG}" 18SRC_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 18fa032c..25bbffe9 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb
@@ -4,12 +4,12 @@ LICENSE = "Proprietary"
4LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493" 4LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
5 5
6XILINX_VCU_VERSION = "1.0.0" 6XILINX_VCU_VERSION = "1.0.0"
7XILINX_RELEASE_VERSION = "2018.3" 7XILINX_RELEASE_VERSION = "v2019.1"
8PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" 8PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
9 9
10BRANCH ?= "master" 10BRANCH ?= "master-rel-2019.1"
11REPO ?= "git://github.com/xilinx/vcu-omx-il.git;protocol=https" 11REPO ?= "git://github.com/xilinx/vcu-omx-il.git;protocol=https"
12SRCREV ?= "cf4b031ac88c7889e4f29ac7fc8ca7592bf12144" 12SRCREV ?= "b93cec02cd5da223fa965073dce130a08ffd6419"
13 13
14BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" 14BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
15SRC_URI = "${REPO};${BRANCHARG}" 15SRC_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 b068aa81..8f8c0ef2 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
@@ -4,12 +4,12 @@ LICENSE = "Proprietary"
4LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493" 4LIC_FILES_CHKSUM = "file://LICENSE.md;md5=03a7aef7e6f6a76a59fd9b8ba450b493"
5 5
6XILINX_VCU_VERSION = "1.0.0" 6XILINX_VCU_VERSION = "1.0.0"
7XILINX_RELEASE_VERSION = "2018.3" 7XILINX_RELEASE_VERSION = "v2019.1"
8PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" 8PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
9 9
10BRANCH ?= "master" 10BRANCH ?= "master-rel-2019.1"
11REPO ?= "git://github.com/xilinx/vcu-ctrl-sw.git;protocol=https" 11REPO ?= "git://github.com/xilinx/vcu-ctrl-sw.git;protocol=https"
12SRCREV ?= "1cb5281d319ea4f3c0eb5514864c80d95e78fe6e" 12SRCREV ?= "32b7be620987283f62e4469185da81dddad1071c"
13 13
14BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" 14BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
15SRC_URI = "${REPO};${BRANCHARG}" 15SRC_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 da447fc7..28bd0d37 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
@@ -4,14 +4,14 @@ LICENSE = "Proprietary"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=63b45903a9a50120df488435f03cf498" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=63b45903a9a50120df488435f03cf498"
5 5
6XILINX_VCU_VERSION = "1.0.0" 6XILINX_VCU_VERSION = "1.0.0"
7XILINX_RELEASE_VERSION = "2018.3" 7XILINX_RELEASE_VERSION = "v2019.1"
8PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" 8PV = "${XILINX_VCU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
9 9
10S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
11 11
12BRANCH ?= "master" 12BRANCH ?= "master-rel-2019.1"
13REPO ?= "git://github.com/xilinx/vcu-firmware.git;protocol=https" 13REPO ?= "git://github.com/xilinx/vcu-firmware.git;protocol=https"
14SRCREV ?= "d01951905e1aedb179d838a6b86016f34e2f4966" 14SRCREV ?= "4078b74d16e5eccca5ae3132c3877d3aff7fb168"
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-xrt/xrt/xrt_git.bb b/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
index d91f3b8f..4bb41b7d 100644
--- a/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=fa343562af4b9b922b8d7fe7b0
7 file://runtime_src/driver/xclng/xrt/user_gem/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ 7 file://runtime_src/driver/xclng/xrt/user_gem/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
8 file://runtime_src/driver/xclng/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87" 8 file://runtime_src/driver/xclng/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87"
9 9
10SRC_URI = "git://github.com/Xilinx/XRT.git;protocol=https" 10SRC_URI = "git://github.com/Xilinx/XRT.git;protocol=https;nobranch=1"
11 11
12PV = "2.2.0+git${SRCPV}" 12PV = "2.2.0+git${SRCPV}"
13SRCREV = "69a7e181d8d53c3b5dde9e8f17ace790141eaa01" 13SRCREV = "da87ac894a037d7e11c0496361458efed4bab438"
14 14
15S = "${WORKDIR}/git/src" 15S = "${WORKDIR}/git/src"
16 16
diff --git a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb b/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
index de437a1e..b47f45fd 100644
--- a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
+++ b/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7SRC_URI = "git://github.com/Xilinx/XRT.git;protocol=https" 7SRC_URI = "git://github.com/Xilinx/XRT.git;protocol=https"
8 8
9PV = "2.2.0+git${SRCPV}" 9PV = "2.2.0+git${SRCPV}"
10SRCREV = "69a7e181d8d53c3b5dde9e8f17ace790141eaa01" 10SRCREV = "da87ac894a037d7e11c0496361458efed4bab438"
11 11
12S = "${WORKDIR}/git/src/runtime_src/driver/zynq/drm/zocl" 12S = "${WORKDIR}/git/src/runtime_src/driver/zynq/drm/zocl"
13 13
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
index b8ba70ea..b8ba70ea 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
index 9b6229db..9b6229db 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
index a98d84c5..a98d84c5 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0003-drm-xilinx-Fix-DPMS-transition-to-on.patch
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0004-minized-wifi-bluetooth.cfg b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0004-minized-wifi-bluetooth.cfg
index f71e53ab..f71e53ab 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2018.3/0004-minized-wifi-bluetooth.cfg
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0004-minized-wifi-bluetooth.cfg
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2018.3.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2019.1.bbappend
index 535fbb26..535fbb26 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2018.3.bbappend
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2019.1.bbappend
diff --git a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2018.3.bb b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.1.bb
index 3432c1f2..030de054 100644
--- a/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2018.3.bb
+++ b/meta-xilinx-standalone/recipes-standalone/pmu-firmware/pmu-firmware_2019.1.bb
@@ -1,10 +1,10 @@
1inherit deploy 1inherit deploy
2 2
3LICENSE = "Proprietary" 3LICENSE = "Proprietary"
4LIC_FILES_CHKSUM = "file://../../../../license.txt;md5=71602ce1bc2917a9be07ceee6fab6711" 4LIC_FILES_CHKSUM = "file://../../../../license.txt;md5=e9b6d01d45faccfbf05d8caea53f0a35"
5 5
6XILINX_RELEASE_VERSION = "v2018.3" 6XILINX_RELEASE_VERSION = "v2019.1"
7SRCREV = "56f3da2afbc817988c9a45b0b26a7fef2ac91706" 7SRCREV = "26c14d9861010a0e3a55c73fb79efdb816eb42ca"
8PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}" 8PV = "${XILINX_RELEASE_VERSION}+git${SRCPV}"
9 9
10SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1" 10SRC_URI = "git://github.com/Xilinx/embeddedsw.git;protocol=https;nobranch=1"
@@ -23,9 +23,6 @@ do_configure() {
23 # manually do the copy_bsp step first, so as to be able to fix up use of 23 # manually do the copy_bsp step first, so as to be able to fix up use of
24 # mb-* commands 24 # mb-* commands
25 ${S}/../misc/copy_bsp.sh 25 ${S}/../misc/copy_bsp.sh
26
27 # fix xilfpga to include the zynqmp backend
28 mv ${S}/../misc/zynqmp_pmufw_bsp/psu_pmu_0/libsrc/xilfpga/src/interface/zynqmp/* ${S}/../misc/zynqmp_pmufw_bsp/psu_pmu_0/libsrc/xilfpga/src
29} 26}
30 27
31COMPILER = "${CC}" 28COMPILER = "${CC}"