From 83e2f22c8daecfdf2daf9e5fcab951d14080f939 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 6 Nov 2025 14:24:28 +0000 Subject: [PATCH] arm/trusted-firmware-a: unify git repository URL git.trustedfirmware.org is an alias for review.trustedfirmware.org. We moved the main recipe to use review.trustedfirmware.org last year[1] but not all other recipes that fetch the source followed, which means that we have to fetch TF-A multiple times. This commit ensures that all the recipes are using the same SRC_URI, so we just fetch TF-A once. [1] a6a4952e ("arm/trusted-firmware-a: use correct git URL") Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb | 2 +- .../recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb | 2 +- .../recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb | 2 +- .../recipes-bsp/trusted-firmware-a/fiptool-native_2.13.0.bb | 2 +- meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb | 2 +- meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb | 2 +- meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.13.0.bb | 2 +- meta-arm/recipes-security/trusted-services/ts-sp-fwu_git.bb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb index ce021527..5d7efcc9 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/cot-dt2c_0.1.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "CoT-dt2c Tool is a python script to convert CoT DT file into corresponding C file" LICENSE = "BSD-3-Clause" -SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb index 1534b7e5..5ae8247c 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.10.17.bb @@ -5,7 +5,7 @@ DESCRIPTION = "fiptool - Trusted Firmware tool for packaging" LICENSE = "BSD-3-Clause" -SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb index cfbfe42b..af4f4f5b 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.12.3.bb @@ -5,7 +5,7 @@ DESCRIPTION = "fiptool - Trusted Firmware tool for packaging" LICENSE = "BSD-3-Clause" -SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=83b7626b8c7a37263c6a58af8d19bee1" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.13.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.13.0.bb index 1eae9eeb..1b5334d8 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.13.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/fiptool-native_2.13.0.bb @@ -5,7 +5,7 @@ DESCRIPTION = "fiptool - Trusted Firmware tool for packaging" LICENSE = "BSD-3-Clause" -SRC_URI_TRUSTED_FIRMWARE_A ?= "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_A ?= "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};destsuffix=fiptool-${PV};branch=${SRCBRANCH}" LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb index e2e46aa0..c484721b 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.10.15.bb @@ -7,7 +7,7 @@ inherit deploy COMPATIBLE_MACHINE ?= "invalid" -SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://review.trustedfirmware.org/TF-A/tf-a-tests;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}" SRCBRANCH = "lts-v2.10" SRCREV = "42c6a147d6f8957ff0b6e9eec4591b0927b8769f" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb index 32baefa4..ecd02f67 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.12.3.bb @@ -7,7 +7,7 @@ inherit deploy COMPATIBLE_MACHINE ?= "invalid" -SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://review.trustedfirmware.org/TF-A/tf-a-tests;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH} \ file://0001-fix-realm-make-PCIe-tests-default-for-testing.patch \ " diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.13.0.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.13.0.bb index 08da7cba..aa7f4904 100644 --- a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.13.0.bb +++ b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.13.0.bb @@ -7,7 +7,7 @@ inherit deploy COMPATIBLE_MACHINE ?= "invalid" -SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://git.trustedfirmware.org/TF-A/tf-a-tests.git;protocol=https" +SRC_URI_TRUSTED_FIRMWARE_A_TESTS ?= "git://review.trustedfirmware.org/TF-A/tf-a-tests;protocol=https" SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A_TESTS};branch=${SRCBRANCH}" SRCBRANCH = "master" SRCREV = "fa267c12f9aa790b43b38d171273cf63892e8d51" diff --git a/meta-arm/recipes-security/trusted-services/ts-sp-fwu_git.bb b/meta-arm/recipes-security/trusted-services/ts-sp-fwu_git.bb index 0ec85b0c..e0230fbf 100644 --- a/meta-arm/recipes-security/trusted-services/ts-sp-fwu_git.bb +++ b/meta-arm/recipes-security/trusted-services/ts-sp-fwu_git.bb @@ -14,7 +14,7 @@ TS_SP_FWU_CONFIG ?= "default" OECMAKE_SOURCEPATH = "${S}/deployments/fwu/config/${TS_SP_FWU_CONFIG}-${TS_ENV}" # The GPT parser component is needed from TF-A -SRC_URI += "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;name=tfa;protocol=https;branch=master;destsuffix=tf-a" +SRC_URI += "git://review.trustedfirmware.org/TF-A/trusted-firmware-a;name=tfa;protocol=https;branch=master;destsuffix=tf-a" SRCREV_tfa = "35f4c7295bafeb32c8bcbdfb6a3f2e74a57e732b" LIC_FILES_CHKSUM = "file://../tf-a/docs/license.rst;md5=b2c740efedc159745b9b31f88ff03dde" do_apply_local_src_patches:append() {