* [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4
@ 2021-03-26 13:15 Ross Burton
2021-03-26 13:15 ` [PATCH 2/4] arm/scp-firmware: remove unused 2.6 version Ross Burton
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ross Burton @ 2021-03-26 13:15 UTC (permalink / raw)
To: meta-arm
Change-Id: I7a3e50a0f5558a135b318d70d6d75eefc570ea2f
Tested-by: Thomas Abraham <thomas.abraham@arm.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta-arm-bsp/conf/machine/sgi575.conf | 4 +---
.../trusted-firmware-a/trusted-firmware-a_2.2.bbappend | 1 -
.../trusted-firmware-a/trusted-firmware-a_2.4.bbappend | 1 +
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf
index 860b6d7..f5baa0f 100644
--- a/meta-arm-bsp/conf/machine/sgi575.conf
+++ b/meta-arm-bsp/conf/machine/sgi575.conf
@@ -8,9 +8,7 @@ require conf/machine/include/arm/armv8-2a/tune-cortexa75.inc
EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
-# Trusted firmware v2.2 version
-PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
-PREFERRED_VERSION_trusted-firmware-a ?= "2.2%"
+PREFERRED_VERSION_trusted-firmware-a ?= "2.4%"
EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
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
index 73e15d0..3c7460f 100644
--- 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
@@ -1,6 +1,5 @@
# Machine specific TFAs
MACHINE_TFA_REQUIRE ?= ""
-MACHINE_TFA_REQUIRE_sgi575 = "trusted-firmware-a-sgi575.inc"
require ${MACHINE_TFA_REQUIRE}
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend
index bdcdb53..827c0b9 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend
@@ -7,6 +7,7 @@ MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc"
MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
+MACHINE_TFA_REQUIRE_sgi575 = "trusted-firmware-a-sgi575.inc"
MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc"
require ${MACHINE_TFA_REQUIRE}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] arm/scp-firmware: remove unused 2.6 version
2021-03-26 13:15 [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4 Ross Burton
@ 2021-03-26 13:15 ` Ross Burton
2021-03-26 13:15 ` [PATCH 3/4] arm/trusted-firmware-a: remove unused trusted-firmware-a 2.2 Ross Burton
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2021-03-26 13:15 UTC (permalink / raw)
To: meta-arm
Change-Id: I3662f139ede7b60d8f0b929cbc40fbdb67be0d72
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../scp-firmware/scp-firmware_2.6%.bbappend | 5 --
..._code-atomically-rewrite-the-generat.patch | 69 -----------------
.../scp-firmware/scp-firmware_2.6.0.bb | 76 -------------------
3 files changed, 150 deletions(-)
delete mode 100644 meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend
delete mode 100644 meta-arm/recipes-bsp/scp-firmware/files/0001-tools-gen_module_code-atomically-rewrite-the-generat.patch
delete mode 100644 meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb
diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend
deleted file mode 100644
index 0d71e55..0000000
--- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware_2.6%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# Include machine specific SCP configurations
-
-MACHINE_SCP_REQUIRE ?= ""
-
-require ${MACHINE_SCP_REQUIRE}
diff --git a/meta-arm/recipes-bsp/scp-firmware/files/0001-tools-gen_module_code-atomically-rewrite-the-generat.patch b/meta-arm/recipes-bsp/scp-firmware/files/0001-tools-gen_module_code-atomically-rewrite-the-generat.patch
deleted file mode 100644
index 05bb025..0000000
--- a/meta-arm/recipes-bsp/scp-firmware/files/0001-tools-gen_module_code-atomically-rewrite-the-generat.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 34e1c04534607f5605255f39fb46e26261fc9c4e Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-Date: Tue, 8 Sep 2020 11:49:08 +0100
-Subject: [PATCH] tools/gen_module_code: atomically rewrite the generated files
-
-The gen_module rule in rules.mk is marked as .PHONY, so make will
-execute it whenever it is mentioned. This results in gen_module_code
-being executed 64 times for a Juno build.
-
-However in heavily parallel builds there's a good chance that
-gen_module_code is writing a file whilst the compiler is reading it
-because make also doesn't know what files are generated by
-gen_module_code.
-
-The correct fix is to adjust the Makefiles so that the dependencies are
-correct but this isn't trivial, so band-aid the problem by atomically
-writing the generated files.
-
-Change-Id: I82d44f9ea6537a91002e1f80de8861d208571630
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- tools/gen_module_code.py | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/tools/gen_module_code.py b/tools/gen_module_code.py
-index 7b395384..ee099b71 100755
---- a/tools/gen_module_code.py
-+++ b/tools/gen_module_code.py
-@@ -17,6 +17,7 @@
- import argparse
- import os
- import sys
-+import tempfile
-
- DEFAULT_PATH = 'build/'
-
-@@ -53,13 +54,21 @@ TEMPLATE_C = "/* This file was auto generated using {} */\n" \
-
- def generate_file(path, filename, content):
- full_filename = os.path.join(path, filename)
-- with open(full_filename, 'a+') as f:
-- f.seek(0)
-- if f.read() != content:
-+
-+ try:
-+ with open(full_filename) as f:
-+ rewrite = f.read() != content
-+ except FileNotFoundError:
-+ rewrite = True
-+
-+ if rewrite:
-+ with tempfile.NamedTemporaryFile(prefix="gen-module-code",
-+ dir=path,
-+ delete=False,
-+ mode="wt") as f:
- print("[GEN] {}...".format(full_filename))
-- f.seek(0)
-- f.truncate()
- f.write(content)
-+ os.replace(f.name, full_filename)
-
-
- def generate_header(path, modules):
---
-2.28.0
-
diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb
deleted file mode 100644
index 123f442..0000000
--- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.6.0.bb
+++ /dev/null
@@ -1,76 +0,0 @@
-SUMMARY = "SCP and MCP Firmware"
-DESCRIPTION = "Firmware for SCP and MCP software reference implementation"
-HOMEPAGE = "https://github.com/ARM-software/SCP-firmware"
-
-LICENSE = "BSD-3-Clause & Apache-2.0"
-LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101b19731 \
- file://cmsis/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-SRC_URI = "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https \
- file://0001-tools-gen_module_code-atomically-rewrite-the-generat.patch"
-SRCREV = "db19910aca6d1032eb0329e5fbb70a92b997f6f2"
-
-PROVIDES += "virtual/control-processor-firmware"
-
-SCP_BUILD_RELEASE ?= "1"
-SCP_PLATFORM ?= "invalid"
-SCP_COMPILER ?= "arm-none-eabi"
-SCP_LOG_LEVEL ?= "WARN"
-
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "virtual/arm-none-eabi-gcc-native"
-
-SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'release', 'debug', d)}"
-
-inherit deploy
-
-B = "${WORKDIR}/build"
-S = "${WORKDIR}/git"
-
-# Allow platform specific copying of only scp or both scp & mcp, default to both
-FW_TARGETS ?= "scp mcp"
-FW_INSTALL ?= "ramfw romfw"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE ?= "invalid"
-
-LDFLAGS[unexport] = "1"
-
-# No configure
-do_configure[noexec] = "1"
-
-EXTRA_OEMAKE = "V=1 \
- BUILD_PATH='${B}' \
- PRODUCT='${SCP_PLATFORM}' \
- MODE='${SCP_BUILD_STR}' \
- LOG_LEVEL='${SCP_LOG_LEVEL}' \
- CC='${SCP_COMPILER}-gcc' \
- AR='${SCP_COMPILER}-ar' \
- SIZE='${SCP_COMPILER}-size' \
- OBJCOPY='${SCP_COMPILER}-objcopy' \
- "
-
-do_compile() {
- oe_runmake -C "${S}"
-}
-do_compile[cleandirs] += "${B}"
-
-do_install() {
- install -d ${D}/firmware
- for FW in ${FW_TARGETS}; do
- for TYPE in ${FW_INSTALL}; do
- install -D "${B}/product/${SCP_PLATFORM}/${FW}_${TYPE}/${SCP_BUILD_STR}/bin/${FW}_${TYPE}.bin" "${D}/firmware/"
- done
- done
-}
-
-FILES_${PN} = "/firmware"
-SYSROOT_DIRS += "/firmware"
-# Skip QA check for relocations in .text of elf binaries
-INSANE_SKIP_${PN} = "textrel"
-
-do_deploy() {
- # Copy the images to deploy directory
- cp -rf ${D}/firmware/* ${DEPLOYDIR}/
-}
-addtask deploy after do_install
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] arm/trusted-firmware-a: remove unused trusted-firmware-a 2.2
2021-03-26 13:15 [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4 Ross Burton
2021-03-26 13:15 ` [PATCH 2/4] arm/scp-firmware: remove unused 2.6 version Ross Burton
@ 2021-03-26 13:15 ` Ross Burton
2021-03-26 13:15 ` [PATCH 4/4] arm/trusted-firmware-a: remove unused trusted-firmware-a 2.3 Ross Burton
2021-03-29 16:02 ` [meta-arm] [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4 Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2021-03-26 13:15 UTC (permalink / raw)
To: meta-arm
Change-Id: If2c92878e63614cfc91cf500a11fe39e5a82fe46
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../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 3c7460f..0000000
--- 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 16bfcf1..0000000
--- 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 <brett.warren@arm.com>
-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 <brett.warren@arm.com>
----
- 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 f4deebb..0000000
--- 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 \
- "
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] arm/trusted-firmware-a: remove unused trusted-firmware-a 2.3
2021-03-26 13:15 [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4 Ross Burton
2021-03-26 13:15 ` [PATCH 2/4] arm/scp-firmware: remove unused 2.6 version Ross Burton
2021-03-26 13:15 ` [PATCH 3/4] arm/trusted-firmware-a: remove unused trusted-firmware-a 2.2 Ross Burton
@ 2021-03-26 13:15 ` Ross Burton
2021-03-29 16:02 ` [meta-arm] [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4 Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Ross Burton @ 2021-03-26 13:15 UTC (permalink / raw)
To: meta-arm
Change-Id: Ifb0bed130a6db8146f37a866385727805e00cd43
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.../trusted-firmware-a_2.3.bbappend | 5 --
...-a5ds-Fix-for-the-system-timer-issue.patch | 34 ------------
...compiler-rt-builtins-when-32-bit-2-3.patch | 52 -------------------
.../trusted-firmware-a_2.3.bb | 35 -------------
4 files changed, 126 deletions(-)
delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch
delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.3/0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch
delete mode 100644 meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bbappend
deleted file mode 100644
index 3c7460f..0000000
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.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/files/0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch b/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch
deleted file mode 100644
index 212eacd..0000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/files/0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Backport [e3c152d1156af8a4b6453376454ecdceaf81704c]
-Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
-
-From e3c152d1156af8a4b6453376454ecdceaf81704c Mon Sep 17 00:00:00 2001
-From: lakshmi Kailasanathan <lakshmi.Kailasanathan@arm.com>
-Date: Fri, 17 Apr 2020 12:52:19 +0100
-Subject: [PATCH] fdts: a5ds: Fix for the system timer issue.
-
-A5DS FPGA system timer clock frequency is 7.5Mhz.
-The dt is file updated inline with the hardware
-clock frequency.
-
-Change-Id: I3f6c2e0d4a7b293175a42cf398a8730448504af9
-Signed-off-by: lakshmi Kailasanathan <lakshmi.Kailasanathan@arm.com>
----
- fdts/a5ds.dts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fdts/a5ds.dts b/fdts/a5ds.dts
-index 7334c4559..c6f5be6fa 100644
---- a/fdts/a5ds.dts
-+++ b/fdts/a5ds.dts
-@@ -128,7 +128,7 @@
- #size-cells = <1>;
- ranges;
- reg = <0x1a040000 0x1000>;
-- clock-frequency = <50000000>;
-+ clock-frequency = <7500000>;
-
- frame@1a050000 {
- frame-number = <0>;
---
-2.17.1
-
diff --git a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.3/0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch b/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.3/0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch
deleted file mode 100644
index 1c01865..0000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a-2.3/0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 39d139a56c54856a718218e30114f732188832ea Mon Sep 17 00:00:00 2001
-From: Brett Warren <brett.warren@arm.com>
-Date: Fri, 27 Nov 2020 14:41:43 +0000
-Subject: [PATCH] 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.3
-
-Upstream-Status: Pending
-Signed-off-by: Brett Warren <brett.warren@arm.com>
----
- Makefile | 7 +++++++
- make_helpers/build_macros.mk | 2 +-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index f01a9ae3e..493b80b14 100644
---- a/Makefile
-+++ b/Makefile
-@@ -243,6 +243,13 @@ endif
- 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 ifneq ($(findstring gcc,$(notdir $(CC))),)
- 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 1c3d14d05..2a1abd4fe 100644
---- a/make_helpers/build_macros.mk
-+++ b/make_helpers/build_macros.mk
-@@ -482,7 +482,7 @@ ifneq ($(findstring armlink,$(notdir $(LD))),)
- else ifneq ($(findstring gcc,$(notdir $(LD))),)
- $$(Q)$$(LD) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) -Wl,-Map=$(MAPFILE) \
- -Wl,-T$(LINKERFILE) $(BUILD_DIR)/build_message.o \
-- $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS)
-+ $(OBJS) $(LDPATHS) $(LIBWRAPPER) $(LDLIBS) $(BL_LIBS) $(RUNTIME_LIB)
- else
- $$(Q)$$(LD) -o $$@ $$(TF_LDFLAGS) $$(LDFLAGS) $(BL_LDFLAGS) -Map=$(MAPFILE) \
- --script $(LINKERFILE) $(BUILD_DIR)/build_message.o \
---
-2.17.1
-
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
deleted file mode 100644
index ad95fa2..0000000
--- a/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.3.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Trusted firmware-A 2.3
-#
-
-require trusted-firmware-a.inc
-
-# Use TF-A for version
-SRCREV_FORMAT = "tfa"
-
-# TF-A v2.3
-SRCREV_tfa = "ecd27ad85f1eba29f6bf92c39dc002c85b07dad5"
-
-LIC_FILES_CHKSUM += "file://docs/license.rst;md5=189505435dbcdcc8caa63c46fe93fa89"
-
-SRC_URI += "file://0001-fdts-a5ds-Fix-for-the-system-timer-issue.patch"
-
-#
-# 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.18"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
-SRC_URI += " \
- file://0001-make-link-compiler-rt-builtins-when-32-bit-2-3.patch \
- "
-
-# mbed TLS v2.18.1
-SRCREV_mbedtls = "ca933c7e0c9e84738b168b6b0feb89af4183a60a"
-
-LIC_FILES_CHKSUM_MBEDTLS = " \
- file://mbedtls/apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
- file://mbedtls/LICENSE;md5=302d50a6369f5f22efdb674db908167a \
- "
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-arm] [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4
2021-03-26 13:15 [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4 Ross Burton
` (2 preceding siblings ...)
2021-03-26 13:15 ` [PATCH 4/4] arm/trusted-firmware-a: remove unused trusted-firmware-a 2.3 Ross Burton
@ 2021-03-29 16:02 ` Jon Mason
3 siblings, 0 replies; 5+ messages in thread
From: Jon Mason @ 2021-03-29 16:02 UTC (permalink / raw)
To: Ross Burton; +Cc: meta-arm
On Fri, Mar 26, 2021 at 01:15:44PM +0000, Ross Burton wrote:
> Change-Id: I7a3e50a0f5558a135b318d70d6d75eefc570ea2f
> Tested-by: Thomas Abraham <thomas.abraham@arm.com>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
Patches in master
Thanks,
Jon
> meta-arm-bsp/conf/machine/sgi575.conf | 4 +---
> .../trusted-firmware-a/trusted-firmware-a_2.2.bbappend | 1 -
> .../trusted-firmware-a/trusted-firmware-a_2.4.bbappend | 1 +
> 3 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/meta-arm-bsp/conf/machine/sgi575.conf b/meta-arm-bsp/conf/machine/sgi575.conf
> index 860b6d7..f5baa0f 100644
> --- a/meta-arm-bsp/conf/machine/sgi575.conf
> +++ b/meta-arm-bsp/conf/machine/sgi575.conf
> @@ -8,9 +8,7 @@ require conf/machine/include/arm/armv8-2a/tune-cortexa75.inc
>
> EXTRA_IMAGEDEPENDS += "virtual/control-processor-firmware"
>
> -# Trusted firmware v2.2 version
> -PREFERRED_PROVIDER_virtual/trusted-firmware-a ?= "trusted-firmware-a"
> -PREFERRED_VERSION_trusted-firmware-a ?= "2.2%"
> +PREFERRED_VERSION_trusted-firmware-a ?= "2.4%"
>
> EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a"
>
> 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
> index 73e15d0..3c7460f 100644
> --- 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
> @@ -1,6 +1,5 @@
> # Machine specific TFAs
>
> MACHINE_TFA_REQUIRE ?= ""
> -MACHINE_TFA_REQUIRE_sgi575 = "trusted-firmware-a-sgi575.inc"
>
> require ${MACHINE_TFA_REQUIRE}
> diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend
> index bdcdb53..827c0b9 100644
> --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend
> +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.4.bbappend
> @@ -7,6 +7,7 @@ MACHINE_TFA_REQUIRE_fvp-base = "trusted-firmware-a-fvp.inc"
> MACHINE_TFA_REQUIRE_fvp-base-arm32 = "trusted-firmware-a-fvp-arm32.inc"
> MACHINE_TFA_REQUIRE_juno = "trusted-firmware-a-juno.inc"
> MACHINE_TFA_REQUIRE_n1sdp = "trusted-firmware-a-n1sdp.inc"
> +MACHINE_TFA_REQUIRE_sgi575 = "trusted-firmware-a-sgi575.inc"
> MACHINE_TFA_REQUIRE_tc0 = "trusted-firmware-a-tc0.inc"
>
> require ${MACHINE_TFA_REQUIRE}
> --
> 2.25.1
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-03-29 16:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-26 13:15 [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4 Ross Burton
2021-03-26 13:15 ` [PATCH 2/4] arm/scp-firmware: remove unused 2.6 version Ross Burton
2021-03-26 13:15 ` [PATCH 3/4] arm/trusted-firmware-a: remove unused trusted-firmware-a 2.2 Ross Burton
2021-03-26 13:15 ` [PATCH 4/4] arm/trusted-firmware-a: remove unused trusted-firmware-a 2.3 Ross Burton
2021-03-29 16:02 ` [meta-arm] [PATCH 1/4] arm-bsp/trusted-firmware-a: upgrade SGI575 to trusted-firmware-a 2.4 Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.