From b1cd463fdf07f81cbf377b70dcfffda1d876777c Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Thu, 11 Jan 2018 15:33:48 -0800 Subject: u-boot-xlnx: Add PV to include file Add PV with Xilinx release version and u-boot version. This follows on similar lines on how we handle kernel recipe Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc | 7 ++++++- meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc index c97a4a4a..90e0ab25 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc @@ -2,9 +2,14 @@ require recipes-bsp/u-boot/u-boot.inc DEPENDS += "bc-native dtc-native" +XILINX_RELEASE_VERSION ?= "" +UBOOT_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}" +PV = "${UBOOT_VERSION}${UBOOT_VERSION_EXTENSION}+git${SRCPV}" + UBOOTURI ?= "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https" -UBRANCH ?= "master" +UBRANCH ?= "" UBRANCHARG = "${@['nobranch=1', 'branch=${UBRANCH}'][d.getVar('UBRANCH', True) != '']}" + SRC_URI = "${UBOOTURI};${UBRANCHARG}" S = "${WORKDIR}/git" diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb index c10564f4..b7817c94 100644 --- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2017.3.bb @@ -1,9 +1,9 @@ -include u-boot-xlnx.inc -include u-boot-spl-zynq-init.inc - +UBOOT_VERSION = "v2017.01" XILINX_RELEASE_VERSION = "v2017.3" SRCREV ?= "da811c4511ef9caeb95f9a22fe49d38bd8e56ded" -PV = "v2017.01-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" + +include u-boot-xlnx.inc +include u-boot-spl-zynq-init.inc SRC_URI_append = " \ file://arm64-zynqmp-Setup-partid-for-QEMU-to-match-silicon.patch \ -- cgit v1.2.3-54-g00ecf