From: "Ross Burton" <ross@burtonini.com>
To: meta-arm@lists.yoctoproject.org
Subject: [PATCH 4/5] arm/trusted-firmware-a: consolidate SRC_URI and S
Date: Fri, 20 Nov 2020 13:45:05 +0000 [thread overview]
Message-ID: <20201120134506.1494232-4-ross.burton@arm.com> (raw)
In-Reply-To: <20201120134506.1494232-1-ross.burton@arm.com>
All the recipes use the same value for SRC_URI and S, so consolidate them
into the include file.
Change-Id: Ieda6b0104e163ce46190e9fc5756a264f7198f25
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 3 +++
.../recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb | 4 ----
.../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb | 4 ----
.../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb | 4 ----
.../recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb | 4 ----
.../recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb | 4 ----
6 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
index f7439c1..1e483a7 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc
@@ -7,6 +7,8 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit deploy
+SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
+
COMPATIBLE_MACHINE ?= "invalid"
COMPATIBLE_MACHINE_qemuarm64 ?= "qemuarm64"
@@ -27,6 +29,7 @@ TFA_SPD_aarch64_qemuall ?= "opteed"
# Build for debug (set TFA_DEBUG to 1 to activate)
TFA_DEBUG ?= "0"
+S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
# mbed TLS support (set TFA_MBEDTLS to 1 to activate)
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb
index 2e41e90..56d3507 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_1.5.bb
@@ -4,16 +4,12 @@
require trusted-firmware-a.inc
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
# Use TF-A for version
SRCREV_FORMAT = "tfa"
# TF-A v1.5
SRCREV_tfa = "ed8112606c54d85781fc8429160883d6310ece32"
-S = "${WORKDIR}/git"
-
LIC_FILES_CHKSUM += "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443"
#
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb
index 96df5c6..44d6d6f 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.1.bb
@@ -4,16 +4,12 @@
require trusted-firmware-a.inc
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
# Use TF-A for version
SRCREV_FORMAT = "tfa"
# TF-A v2.1
SRCREV_tfa = "e1286bdb968ee74fc52f96cf303a4218e1ae2950"
-S = "${WORKDIR}/git"
-
LIC_FILES_CHKSUM += "file://license.rst;md5=c709b197e22b81ede21109dbffd5f363"
#
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb
index 58e6c8e..4e8882c 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb
@@ -4,16 +4,12 @@
require trusted-firmware-a.inc
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
# Use TF-A for version
SRCREV_FORMAT = "tfa"
# TF-A v2.2
SRCREV_tfa = "7192b956bde11652a835eee0724dca0e403fee90"
-S = "${WORKDIR}/git"
-
LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
#
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
index d333854..6c8308a 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
@@ -4,16 +4,12 @@
require trusted-firmware-a.inc
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
# Use TF-A for version
SRCREV_FORMAT = "tfa"
# TF-A v2.3
SRCREV_tfa = "ecd27ad85f1eba29f6bf92c39dc002c85b07dad5"
-S = "${WORKDIR}/git"
-
LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
#
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb
index 6adc00b..8dab35f 100644
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb
+++ b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_git.bb
@@ -8,13 +8,9 @@ DEFAULT_PREFERENCE = "-1"
require trusted-firmware-a.inc
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa"
-
# Use TF-A for version
SRCREV_FORMAT = "tfa"
-S = "${WORKDIR}/git"
-
LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
#
--
2.25.1
next prev parent reply other threads:[~2020-11-20 13:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 13:45 [PATCH 1/5] arm-bsp/fvp-common: explicitly select trusted-firmware-a 2.3 Ross Burton
2020-11-20 13:45 ` [PATCH 2/5] arm-bsp/fvp-base-arm32: explicitly select trusted-firmware-a 2.2 Ross Burton
2020-11-20 13:45 ` [PATCH 3/5] arm-bsp/a5ds: explicitly select trusted-firmware-a 2.3 Ross Burton
2020-11-20 13:45 ` Ross Burton [this message]
2020-11-20 13:45 ` [PATCH 5/5] arm/trusted-firmare-a: add version 2.4 Ross Burton
2020-11-20 16:12 ` [meta-arm] [PATCH 1/5] arm-bsp/fvp-common: explicitly select trusted-firmware-a 2.3 Jon Mason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201120134506.1494232-4-ross.burton@arm.com \
--to=ross@burtonini.com \
--cc=meta-arm@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.