From 535bcdf9796e1e2ca26286a45d8882003eb0b5b6 Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Thu, 11 Jan 2018 15:32:15 -0800 Subject: arm-trusted-firmware: Add PV to include file Add PV with Xilinx release version and ATF version. This follows on similar lines on how we handle kernel recipe Signed-off-by: Manjukumar Matha --- .../recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc | 6 +++++- .../recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.3.bb | 5 ++--- 2 files changed, 7 insertions(+), 4 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 80d14f96..2aceba4f 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 @@ -12,7 +12,11 @@ DEPENDS += "u-boot-mkimage-native" S = "${WORKDIR}/git" B = "${WORKDIR}/build" -BRANCH ?= "master" +XILINX_RELEASE_VERSION ?= "" +ATF_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}" +PV = "${ATF_VERSION}${ATF_VERSION_EXTENSION}+git${SRCPV}" + +BRANCH ?= "" REPO ?= "git://github.com/Xilinx/arm-trusted-firmware.git;protocol=https" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" SRC_URI = "${REPO};${BRANCHARG}" diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.3.bb b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.3.bb index 9bf5cacf..a9d46691 100644 --- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.3.bb +++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2017.3.bb @@ -1,6 +1,5 @@ -include arm-trusted-firmware.inc - +ATF_VERSION = "1.3" XILINX_RELEASE_VERSION = "v2017.3" SRCREV ?= "f9b244beaa7ac6a670b192192b6e92e5fd6044dc" -PV = "1.3-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" +include arm-trusted-firmware.inc -- cgit v1.2.3-54-g00ecf