[PATCH 1/3] arm/trusted-firmware-a: drop clang tweaks

[PATCH 1/3] arm/trusted-firmware-a: drop clang tweaks

[Ross Burton]

These Clang patches don't appear to be needed anymore.  TF-A doesn't
build for various platforms but the unusual errors these patches work
around are not the cause.

Change-Id: I41dffc4f19d298d5861bb0274e6ffef6c24f4ca3
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...-PMF_STOTE_ENABLE-pass-Wtautological.patch | 31 -------------------
 ...tables-v2-remove-tautological-assert.patch | 31 -------------------
 .../trusted-firmware-a/trusted-firmware-a.inc |  5 ---
 3 files changed, 67 deletions(-)
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch
 delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0003-xlat-tables-v2-remove-tautological-assert.patch

diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch
deleted file mode 100644
index 42e0f5b..0000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c9209fa0f474d41bc5ecf2b988ab404123038c1b Mon Sep 17 00:00:00 2001
-From: Brett Warren <brett.warren@arm.com>
-Date: Tue, 3 Nov 2020 13:34:26 +0000
-Subject: [PATCH] pmf.h: made PMF_STOTE_ENABLE pass -Wtautological
-
-When compiling with clang, PMF_STORE_ENABLE triggers
--Wtautological-constant-compare. To mitigate, the definition
-is modified cosmetically to not trigger this error.
-
-Upstream-Status: Pending
-Signed-off-by: Brett Warren <brett.warren@arm.com>
----
- include/lib/pmf/pmf.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/lib/pmf/pmf.h b/include/lib/pmf/pmf.h
-index df7c9ff31..baa2dfd60 100644
---- a/include/lib/pmf/pmf.h
-+++ b/include/lib/pmf/pmf.h
-@@ -25,7 +25,7 @@
- /*
-  * Flags passed to PMF_REGISTER_SERVICE
-  */
--#define PMF_STORE_ENABLE	(1 << 0)
-+#define PMF_STORE_ENABLE	1
- #define PMF_DUMP_ENABLE		(1 << 1)
- 
- /*
--- 
-2.17.1
-
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/files/0003-xlat-tables-v2-remove-tautological-assert.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0003-xlat-tables-v2-remove-tautological-assert.patch
deleted file mode 100644
index c24b1cf..0000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0003-xlat-tables-v2-remove-tautological-assert.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a0b72074ee4cfdf0ff3b807b01a962898761def4 Mon Sep 17 00:00:00 2001
-From: Brett Warren <brett.warren@arm.com>
-Date: Fri, 27 Nov 2020 10:29:48 +0000
-Subject: [PATCH] xlat_tables_v2: remove tautological assert
-
-When compiling with clang for aarch32, an assert triggered
--Wtautological error. This assertion is removed, as
-this means there is no way for it to resolve as false anyway.
-
-Upstream-Status: Pending
-Signed-off-by: Brett Warren <brett.warren@arm.com>
----
- lib/xlat_tables_v2/aarch32/xlat_tables_arch.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/lib/xlat_tables_v2/aarch32/xlat_tables_arch.c b/lib/xlat_tables_v2/aarch32/xlat_tables_arch.c
-index b69c6702b..52a75b37a 100644
---- a/lib/xlat_tables_v2/aarch32/xlat_tables_arch.c
-+++ b/lib/xlat_tables_v2/aarch32/xlat_tables_arch.c
-@@ -203,8 +203,6 @@ void setup_mmu_cfg(uint64_t *params, unsigned int flags,
- 
- 		assert(virtual_addr_space_size >=
- 			xlat_get_min_virt_addr_space_size());
--		assert(virtual_addr_space_size <=
--			MAX_VIRT_ADDR_SPACE_SIZE);
- 		assert(IS_POWER_OF_TWO(virtual_addr_space_size));
- 
- 		/*
--- 
-2.17.1
-
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 33ae64b..a3de645 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
@@ -55,11 +55,6 @@ LIC_FILES_CHKSUM_append = "${@bb.utils.contains('TFA_MBEDTLS', '1', ' ${LIC_FILE
 # add mbed TLS to version
 SRCREV_FORMAT_append = "${@bb.utils.contains('TFA_MBEDTLS', '1', '_mbedtls', '', d)}"
 
-SRC_URI_append = " \
-    file://0002-pmf.h-made-PMF_STOTE_ENABLE-pass-Wtautological.patch  \
-    file://0003-xlat-tables-v2-remove-tautological-assert.patch \
-    "
-
 # U-boot support (set TFA_UBOOT to 1 to activate)
 # When U-Boot support is activated BL33 is activated with u-boot.bin file
 TFA_UBOOT ?= "0"
-- 
2.25.1

[PATCH 2/3] arm/trusted-firmware-a: update TC0 to 2.5

[Ross Burton]

TC0 has been using an intermediate SHA post-2.4 as it needed some commits
that were only in the integration branch.

We now have 2.5 which includes these commits, so move to that release.

Change-Id: Ic56c3daa9a408e837219c4f81d22081bbcc5c56d
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../trusted-firmware-a/trusted-firmware-a-tc0.inc           | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc
index 20b52e9..53ff110 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-tc0.inc
@@ -1,11 +1,5 @@
 # TC0 specific TFA configuration
 
-# Intermediate SHA with 2.4 baseline version, required for Theodul DSU
-# --- This SRC_URI will be removed once below SRCREV_tfa gets merged to TF-A master
-SRC_URI = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;branch=integration;name=tfa"
-SRCREV_tfa = "9bc3007d3bb9363dbd5f6655d2b17d599e22bac4"
-PV = "2.4+git${SRCPV}"
-
 DEPENDS += "scp-firmware"
 
 COMPATIBLE_MACHINE = "tc0"
-- 
2.25.1

[PATCH 3/3] arm/trusted-firmware-a: disable -Werror

[Ross Burton]

-Werror is typically a bad idea in distribution builds, as changes to
the compiler or other libraries can cause new warnings to appear.

For example, when building the N1SDP platform:

  error: "GIC-600 Multichip driver is currently experimental and the API
          may change in future." [-Werror,-W#warnings]

Set E=0 so that -Werror is not used in the build.

Change-Id: I8905fc9d4e95edb42970fe3839b9ab6b5384a123
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 a3de645..57f1438 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
@@ -100,7 +100,8 @@ EXTRA_OEMAKE += "LD=${@remove_options_tail(d.getVar('LD'))}"
 
 EXTRA_OEMAKE += "CC=${@remove_options_tail(d.getVar('CC'))}"
 
-EXTRA_OEMAKE += "V=1"
+# Verbose builds, no -Werror
+EXTRA_OEMAKE += "V=1 E=0"
 
 # Add platform parameter
 EXTRA_OEMAKE += "BUILD_BASE=${B} PLAT=${TFA_PLATFORM}"
-- 
2.25.1