From 080ad12f8f670323bb558426aa02ddca8d8a1d0d Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Sat, 19 Nov 2016 18:23:43 +1000 Subject: u-boot-xlnx: Embed Xilinx Release Version into PV Embed the Xilinx Release Version into the PV of the u-boot-xlnx recipes. This allows for easier determination of which version of u-boot-xlnx is in use and avoid any ambiguity when one or more Xilinx Release uses the same upstream u-boot version. This removes the need for the comment on what the SRCREV points at, instead this is replaced with a XILINX_RELEASE_VERSION variable which contains the 'vYYYY.X' release string. Signed-off-by: Nathan Rossi --- recipes-bsp/u-boot/u-boot-xlnx-dev.bb | 2 +- recipes-bsp/u-boot/u-boot-xlnx.inc | 2 -- recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-xlnx-dev.bb b/recipes-bsp/u-boot/u-boot-xlnx-dev.bb index 78dfcf66..7653da5a 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx-dev.bb +++ b/recipes-bsp/u-boot/u-boot-xlnx-dev.bb @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce SRCREV_DEFAULT = "aebea9d20a5aa32857f320c07ca8f9fd1b3dec1f" SRCREV ?= "${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/bootloader", "u-boot-xlnx-dev", "${AUTOREV}", "${SRCREV_DEFAULT}", d)}" -PV = "${UBRANCH}${XILINX_EXTENSION}+git${SRCPV}" +PV = "${UBRANCH}-xilinx-dev+git${SRCPV}" # Newer versions of u-boot have support for these HAS_PS7INIT ?= " \ diff --git a/recipes-bsp/u-boot/u-boot-xlnx.inc b/recipes-bsp/u-boot/u-boot-xlnx.inc index 78b331a5..09feb7f2 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx.inc +++ b/recipes-bsp/u-boot/u-boot-xlnx.inc @@ -2,8 +2,6 @@ require recipes-bsp/u-boot/u-boot.inc DEPENDS += "dtc-native" -XILINX_EXTENSION = "-xilinx" - UBRANCH ?= "master" SRC_URI = "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https;branch=${UBRANCH}" diff --git a/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb b/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb index 2107e1d9..a6b243d5 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb +++ b/recipes-bsp/u-boot/u-boot-xlnx_2016.01.bb @@ -1,9 +1,9 @@ include u-boot-xlnx.inc include u-boot-spl-zynq-init.inc -# this matches u-boot-xlnx 'xilinx-v2016.2' release tag +XILINX_RELEASE_VERSION = "v2016.2" SRCREV = "0daf88c7f8c9085a81336a0ad2dd3bcc84c7a18a" -PV = "v2016.01${XILINX_EXTENSION}+git${SRCPV}" +PV = "v2016.01-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-xlnx:" -- cgit v1.2.3-54-g00ecf