| Message ID | 20220616135034.3787137-2-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] arm-bsp/trusted-firmware-a: remove SGI-575 workaround | expand |
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.0.bbappend similarity index 100% rename from meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bbappend rename to meta-arm-bsp/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.0.bbappend diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend deleted file mode 100644 index f317cb8c..00000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" - -# Don't put machine customisation in here, use a versioned append. \ No newline at end of file diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.%.bbappend similarity index 92% rename from meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bbappend rename to meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.%.bbappend index f8b2ac1b..09ed3f79 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bbappend +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.%.bbappend @@ -1,3 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" + # Machine specific TFAs MACHINE_TFA_REQUIRE ?= "" diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bb b/meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.0.bb similarity index 100% rename from meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/tf-a-tests_2.7.0.bb diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bb b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.0.bb similarity index 100% rename from meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.bb rename to meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.7.0.bb
The upstream version is 2.7.0, so use that name instead of just 2.7. Also remove the unversioned bbappend which simply extended FILESEXTRAPATHS, there's no need for this split now that we aim to have ~1 version of TF-A in the tree. Signed-off-by: Ross Burton <ross.burton@arm.com> --- .../{tf-a-tests_2.7.bbappend => tf-a-tests_2.7.0.bbappend} | 0 .../trusted-firmware-a/trusted-firmware-a_2.%.bbappend | 3 --- ...rmware-a_2.7.bbappend => trusted-firmware-a_2.7.%.bbappend} | 2 ++ .../{tf-a-tests_2.7.bb => tf-a-tests_2.7.0.bb} | 0 .../{trusted-firmware-a_2.7.bb => trusted-firmware-a_2.7.0.bb} | 0 5 files changed, 2 insertions(+), 3 deletions(-) rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.7.bbappend => tf-a-tests_2.7.0.bbappend} (100%) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.%.bbappend rename meta-arm-bsp/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.7.bbappend => trusted-firmware-a_2.7.%.bbappend} (92%) rename meta-arm/recipes-bsp/trusted-firmware-a/{tf-a-tests_2.7.bb => tf-a-tests_2.7.0.bb} (100%) rename meta-arm/recipes-bsp/trusted-firmware-a/{trusted-firmware-a_2.7.bb => trusted-firmware-a_2.7.0.bb} (100%)