diff --git a/.editorconfig b/.editorconfig index 0e7a5c3..928c307 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,10 +1,10 @@ # -# Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2017-2019, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -# ARM Trusted Firmware Coding style spec for editors. +# Trusted Firmware-A Coding style spec for editors. # References: # [EC] http://editorconfig.org/ diff --git a/Makefile b/Makefile index 471cf59..c4ff53f 100644 --- a/Makefile +++ b/Makefile @@ -510,9 +510,8 @@ # Process platform overrideable behaviour ################################################################################ -# Using the ARM Trusted Firmware BL2 implies that a BL33 image also needs to be -# supplied for the FIP and Certificate generation tools. This flag can be -# overridden by the platform. +# Using BL2 implies that a BL33 image also needs to be supplied for the FIP and +# Certificate generation tools. This flag can be overridden by the platform. ifdef BL2_SOURCES ifdef EL3_PAYLOAD_BASE # If booting an EL3 payload there is no need for a BL33 image diff --git a/bl32/optee/optee.mk b/bl32/optee/optee.mk index 462020f..c8aa7ce 100644 --- a/bl32/optee/optee.mk +++ b/bl32/optee/optee.mk @@ -1,10 +1,10 @@ # -# Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2016-2019, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # -# This makefile only aims at complying with ARM Trusted Firmware build process so -# that "optee" is a valid ARM Trusted Firmware AArch32 Secure Playload identifier. +# This makefile only aims at complying with Trusted Firmware-A build process so +# that "optee" is a valid TF-A AArch32 Secure Playload identifier. ifneq ($(ARCH),aarch32) $(error This directory targets AArch32 support) @@ -12,4 +12,4 @@ $(eval $(call add_define,AARCH32_SP_OPTEE)) -$(info ARM Trusted Firmware built for OP-TEE payload support) +$(info Trusted Firmware-A built for OP-TEE payload support) diff --git a/common/tf_log.c b/common/tf_log.c index 3e174dd..08d3cf4 100644 --- a/common/tf_log.c +++ b/common/tf_log.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2019, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -15,7 +15,7 @@ static unsigned int max_log_level = LOG_LEVEL; /* - * The common log function which is invoked by ARM Trusted Firmware code. + * The common log function which is invoked by TF-A code. * This function should not be directly invoked and is meant to be * only used by the log macros defined in debug.h. The function * expects the first character in the format string to be one of the diff --git a/docs/change-log.rst b/docs/change-log.rst index 4ef3ac1..70aafc0 100644 --- a/docs/change-log.rst +++ b/docs/change-log.rst @@ -632,8 +632,8 @@ - Introduce External Abort handling on AArch64 External Abort routed to EL3 was reported as an unhandled exception - and caused a panic. This change enables Arm Trusted Firmware-A to - handle External Aborts routed to EL3. + and caused a panic. This change enables Trusted Firmware-A to handle + External Aborts routed to EL3. - Save value of ACTLR_EL1 implementation-defined register in the CPU context structure rather than forcing it to 0. diff --git a/docs/components/secure-partition-manager-design.rst b/docs/components/secure-partition-manager-design.rst index ac1172c..de0792d 100644 --- a/docs/components/secure-partition-manager-design.rst +++ b/docs/components/secure-partition-manager-design.rst @@ -250,7 +250,7 @@ A SVC causes an exception to be taken to S-EL1. TF-A assumes ownership of S-EL1 and installs a simple exception vector table in S-EL1 that relays a SVC request from a Secure Partition as a SMC request to the SPM in EL3. Upon servicing the -SMC request, Arm Trusted Firmware returns control directly to S-EL0 through an +SMC request, Trusted Firmware-A returns control directly to S-EL0 through an ERET instruction. Calling conventions @@ -806,7 +806,7 @@ -------------- -*Copyright (c) 2017-2018, Arm Limited and Contributors. All rights reserved.* +*Copyright (c) 2017-2019, Arm Limited and Contributors. All rights reserved.* .. _Armv8-A ARM: https://developer.arm.com/docs/ddi0487/latest/arm-architecture-reference-manual-armv8-for-armv8-a-architecture-profile .. _instructions in the EDK2 repository: https://github.com/tianocore/edk2-staging/blob/AArch64StandaloneMm/HowtoBuild.MD diff --git a/docs/perf/psci-performance-juno.rst b/docs/perf/psci-performance-juno.rst index b6fd8c8..4cc4302 100644 --- a/docs/perf/psci-performance-juno.rst +++ b/docs/perf/psci-performance-juno.rst @@ -2,9 +2,9 @@ ============================================================== This document summarises the findings of performance measurements of key -operations in the ARM Trusted Firmware (TF) Power State Coordination Interface -(PSCI) implementation, using the in-built Performance Measurement Framework -(PMF) and runtime instrumentation timestamps. +operations in the Trusted Firmware-A Power State Coordination Interface (PSCI) +implementation, using the in-built Performance Measurement Framework (PMF) and +runtime instrumentation timestamps. Method ------ @@ -284,5 +284,9 @@ We suspect the time for lead CPU 4 is shorter than CPU 5 due to subtle cache effects, given that these measurements are at the nano-second level. +-------------- + +*Copyright (c) 2019, Arm Limited and Contributors. All rights reserved.* + .. _Juno R1 platform: https://www.arm.com/files/pdf/Juno_r1_ARM_Dev_datasheet.pdf .. _TF master as of 31/01/2017: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/tree/?id=c38b36d diff --git a/docs/resources/diagrams/Makefile b/docs/resources/diagrams/Makefile index de7d8f3..7f583b5 100644 --- a/docs/resources/diagrams/Makefile +++ b/docs/resources/diagrams/Makefile @@ -1,10 +1,10 @@ # -# Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2015-2019, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # # -# This Makefile generates the image files used in the ARM Trusted Firmware +# This Makefile generates the image files used in the Trusted Firmware-A # document from the dia file. # # The PNG files in the present directory have been generated using Dia version diff --git a/services/spd/opteed/teesmc_opteed.h b/services/spd/opteed/teesmc_opteed.h index ec821ba..c82b58a 100644 --- a/services/spd/opteed/teesmc_opteed.h +++ b/services/spd/opteed/teesmc_opteed.h @@ -17,7 +17,7 @@ * full 64 bit values in the argument registers if invoked from Aarch64 * mode. This violates the SMC Calling Convention, but since this * convention only coveres API towards Normal World it's something that - * only concerns the OP-TEE Dispatcher in ARM Trusted Firmware and OP-TEE + * only concerns the OP-TEE Dispatcher in Trusted Firmware-A and OP-TEE * OS at Secure EL1. */