From 452bc972764eeb0684070c247f4b96b8e551e21d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 26 Mar 2021 13:15:46 +0000 Subject: [PATCH] arm/trusted-firmware-a: remove unused trusted-firmware-a 2.2 Change-Id: If2c92878e63614cfc91cf500a11fe39e5a82fe46 Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../trusted-firmware-a_2.2.bbappend | 5 -- ...compiler-rt-builtins-when-32-bit-2-2.patch | 54 ------------------- .../trusted-firmware-a_2.2.bb | 33 ------------ 3 files changed, 92 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.2/0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend deleted file mode 100644 index 3c7460f2..00000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# Machine specific TFAs - -MACHINE_TFA_REQUIRE ?= "" - -require ${MACHINE_TFA_REQUIRE} diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.2/0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.2/0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch deleted file mode 100644 index 16bfcf19..00000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.2/0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f2855c0957ded1af279724c1a82c3e381cc036f9 Mon Sep 17 00:00:00 2001 -From: Brett Warren -Date: Fri, 27 Nov 2020 10:12:07 +0000 -Subject: [PATCH 3/3] make: link compiler-rt builtins when 32-bit - -Compiler-rt builtins weren't previously linked when using -GNU ld to link for aarch32; this is now explicitly linked -in. - -For use with TFA 2.2 - -Upstream-Status: Pending -Signed-off-by: Brett Warren ---- - Makefile | 9 +++++++++ - make_helpers/build_macros.mk | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 721246d51..5bf8e9a11 100644 ---- a/Makefile -+++ b/Makefile -@@ -204,6 +204,15 @@ LD = $(LINKER) - AS = $(CC) -c -x assembler-with-cpp $(TF_CFLAGS_$(ARCH)) - CPP = $(CC) -E - PP = $(CC) -E -+ -+ifeq (${ARCH},aarch32) -+RUNTIME_LIB = $(shell $(CC) --sysroot=$(RUNTIME_SYSROOT) \ -+ $(shell sed 's/none/linux/' <<< '$(target32-directive)') \ -+ -mfloat-abi=$(TARGET_FPU) \ -+ -rtlib=compiler-rt \ -+ -print-libgcc-file-name 2> /dev/null) -+endif -+ - else - TF_CFLAGS_aarch32 = $(march32-directive) - TF_CFLAGS_aarch64 = $(march64-directive) -diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk -index b89d87ea6..1ff345336 100644 ---- a/make_helpers/build_macros.mk -+++ b/make_helpers/build_macros.mk -@@ -436,7 +436,7 @@ ifneq ($(findstring armlink,$(notdir $(LD))),) - else - $$(Q)$$(LD) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) -Map=$(MAPFILE) \ - --script $(LINKERFILE) $(BUILD_DIR)/build_message.o \ -- $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS) -+ $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS) $(RUNTIME_LIB) - endif - ifeq ($(DISABLE_BIN_GENERATION),1) - @${ECHO_BLANK_LINE} --- -2.17.1 - 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 deleted file mode 100644 index f4deebb1..00000000 --- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.2.bb +++ /dev/null @@ -1,33 +0,0 @@ -# -# Trusted firmware-A 2.2 -# - -require trusted-firmware-a.inc - -# Use TF-A for version -SRCREV_FORMAT = "tfa" - -# TF-A v2.2 -SRCREV_tfa = "7192b956bde11652a835eee0724dca0e403fee90" - -LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89" - -# -# mbed TLS source -# Those are used in trusted-firmware-a.inc if TFA_MBEDTLS is set to 1 -# - -SRC_URI_MBEDTLS = "git://github.com/ARMmbed/mbedtls.git;name=mbedtls;protocol=https;destsuffix=git/mbedtls;branch=mbedtls-2.16" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" -SRC_URI += " \ - file://0001-make-link-compiler-rt-builtins-when-32-bit-2-2.patch \ - " - -# mbed TLS v2.16.2 -SRCREV_mbedtls = "d81c11b8ab61fd5b2da8133aa73c5fe33a0633eb" - -LIC_FILES_CHKSUM_MBEDTLS = " \ - file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \ - "