summaryrefslogtreecommitdiff
path: root/src/arch/arm64
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-08-02 12:45:24 -0700
committerPatrick Georgi <pgeorgi@google.com>2019-08-30 10:37:17 +0000
commit0a8da746c21818429f3799a1956958830bbf22f6 (patch)
tree5e4e4ca9edf16a540e61783c0c6ebfe173bb64af /src/arch/arm64
parent7e4d16b861e954c2faad2ede0b2fede4d5578371 (diff)
downloadcoreboot-0a8da746c21818429f3799a1956958830bbf22f6.tar.xz
arm64: Rename arm_tf.c/h to bl31.c/h
This patch renames arm_tf.c and arm_tf.h to bl31.c and bl31.h, respectively. That name is closer to the terminology used in most functions related to Trusted Firmware, and it removes the annoying auto-completion clash between arm64/arm_tf.c and arm64/armv8. Change-Id: I2741e2bce9d079b1025f82ecb3bb78a02fe39ed5 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34677 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Diffstat (limited to 'src/arch/arm64')
-rw-r--r--src/arch/arm64/Makefile.inc2
-rw-r--r--src/arch/arm64/bl31.c (renamed from src/arch/arm64/arm_tf.c)4
-rw-r--r--src/arch/arm64/boot.c4
-rw-r--r--src/arch/arm64/include/bl31.h (renamed from src/arch/arm64/include/arm_tf.h)8
4 files changed, 9 insertions, 9 deletions
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 5992a2a5e2..1aee6b83f7 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -131,7 +131,7 @@ ramstage-$(CONFIG_ARM64_USE_ARCH_TIMER) += arch_timer.c
ramstage-y += memset.S
ramstage-y += memcpy.S
ramstage-y += memmove.S
-ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += arm_tf.c
+ramstage-$(CONFIG_ARM64_USE_ARM_TRUSTED_FIRMWARE) += bl31.c
ramstage-y += transition.c transition_asm.S
ramstage-$(CONFIG_PAYLOAD_FIT_SUPPORT) += fit_payload.c
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/bl31.c
index 5059a89391..fb24dff40e 100644
--- a/src/arch/arm64/arm_tf.c
+++ b/src/arch/arm64/bl31.c
@@ -15,7 +15,7 @@
#include <arch/lib_helpers.h>
#include <arch/mmu.h>
#include <arch/transition.h>
-#include <arm_tf.h>
+#include <bl31.h>
#include <bootmem.h>
#include <cbfs.h>
#include <console/console.h>
@@ -40,7 +40,7 @@ void __weak *soc_get_bl31_plat_params(bl31_params_t *params)
return NULL;
}
-void arm_tf_run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr)
+void run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr)
{
struct prog bl31 = PROG_INIT(PROG_BL31, CONFIG_CBFS_PREFIX"/bl31");
void (*bl31_entry)(bl31_params_t *params, void *plat_params) = NULL;
diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c
index 58d7234710..c6df0ee02e 100644
--- a/src/arch/arm64/boot.c
+++ b/src/arch/arm64/boot.c
@@ -15,7 +15,7 @@
#include <arch/lib_helpers.h>
#include <arch/stages.h>
#include <arch/transition.h>
-#include <arm_tf.h>
+#include <bl31.h>
#include <program_loading.h>
static void run_payload(struct prog *prog)
@@ -28,7 +28,7 @@ static void run_payload(struct prog *prog)
u64 payload_spsr = get_eret_el(EL2, SPSR_USE_L);
if (CONFIG(ARM64_USE_ARM_TRUSTED_FIRMWARE))
- arm_tf_run_bl31((u64)doit, (u64)arg, payload_spsr);
+ run_bl31((u64)doit, (u64)arg, payload_spsr);
else
transition_to_el2(doit, arg, payload_spsr);
}
diff --git a/src/arch/arm64/include/arm_tf.h b/src/arch/arm64/include/bl31.h
index 692a5beb22..08855f64cf 100644
--- a/src/arch/arm64/include/arm_tf.h
+++ b/src/arch/arm64/include/bl31.h
@@ -11,8 +11,8 @@
* GNU General Public License for more details.
*/
-#ifndef __ARM_TF_H__
-#define __ARM_TF_H__
+#ifndef __BL31_H__
+#define __BL31_H__
#include <types.h>
@@ -20,9 +20,9 @@
#include <arm_tf_temp.h>
/* Load and enter BL31, set it up to exit to payload according to arguments. */
-void arm_tf_run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr);
+void run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr);
/* Return platform-specific bl31_plat_params. May update bl31_params. */
void *soc_get_bl31_plat_params(bl31_params_t *bl31_params);
-#endif /* __ARM_TF_H__ */
+#endif /* __BL31_H__ */