From e52410e281f3ef07a83593c66beab632363d1a80 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 19 Nov 2020 08:45:19 +0000 Subject: [PATCH] arm/trusted-firmware-a: consolidate SRC_URI and S 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 Signed-off-by: Jon Mason --- .../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 12392e58..3fcb6f8d 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 2e41e90f..56d3507e 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 96df5c67..44d6d6fd 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 58e6c8e8..4e8882c3 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 d333854c..6c8308af 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 6adc00ba..8dab35f5 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" #