diff options
author | Julius Werner <jwerner@chromium.org> | 2019-08-02 12:45:24 -0700 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-08-30 10:37:17 +0000 |
commit | 0a8da746c21818429f3799a1956958830bbf22f6 (patch) | |
tree | 5e4e4ca9edf16a540e61783c0c6ebfe173bb64af /src/arch/arm64/arm_tf.c | |
parent | 7e4d16b861e954c2faad2ede0b2fede4d5578371 (diff) |
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/arm_tf.c')
-rw-r--r-- | src/arch/arm64/arm_tf.c | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c deleted file mode 100644 index 5059a89391..0000000000 --- a/src/arch/arm64/arm_tf.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <arch/cache.h> -#include <arch/lib_helpers.h> -#include <arch/mmu.h> -#include <arch/transition.h> -#include <arm_tf.h> -#include <bootmem.h> -#include <cbfs.h> -#include <console/console.h> -#include <program_loading.h> - -/* - * TODO: Many of these structures are currently unused. Better not fill them out - * to make future changes fail fast, rather than try to come up with content - * that might turn out to not make sense. Implement later as required. - * -static image_info_t bl31_image_info; -static image_info_t bl32_image_info; -static image_info_t bl33_image_info; - */ -static entry_point_info_t bl32_ep_info; -static entry_point_info_t bl33_ep_info; -static bl31_params_t bl31_params; - -void __weak *soc_get_bl31_plat_params(bl31_params_t *params) -{ - /* Default weak implementation. */ - return NULL; -} - -void arm_tf_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; - - if (prog_locate(&bl31)) - die("BL31 not found"); - - if (!selfload_check(&bl31, BM_MEM_BL31)) - die("BL31 load failed"); - bl31_entry = prog_entry(&bl31); - - SET_PARAM_HEAD(&bl31_params, PARAM_BL31, VERSION_1, 0); - - if (CONFIG(ARM64_USE_SECURE_OS)) { - struct prog bl32 = PROG_INIT(PROG_BL32, - CONFIG_CBFS_PREFIX"/secure_os"); - - if (prog_locate(&bl32)) - die("BL32 not found"); - - if (cbfs_prog_stage_load(&bl32)) - die("BL32 load failed"); - - SET_PARAM_HEAD(&bl32_ep_info, PARAM_EP, VERSION_1, - PARAM_EP_SECURE); - bl32_ep_info.pc = (uintptr_t)prog_entry(&bl32); - bl32_ep_info.spsr = SPSR_EXCEPTION_MASK | - get_eret_el(EL1, SPSR_USE_L); - bl31_params.bl32_ep_info = &bl32_ep_info; - } - - bl31_params.bl33_ep_info = &bl33_ep_info; - - SET_PARAM_HEAD(&bl33_ep_info, PARAM_EP, VERSION_1, PARAM_EP_NON_SECURE); - bl33_ep_info.pc = payload_entry; - bl33_ep_info.spsr = payload_spsr; - bl33_ep_info.args.arg0 = payload_arg0; - - /* May update bl31_params if necessary. */ - void *bl31_plat_params = soc_get_bl31_plat_params(&bl31_params); - - /* MMU disable will flush cache, so passed params land in memory. */ - raw_write_daif(SPSR_EXCEPTION_MASK); - mmu_disable(); - bl31_entry(&bl31_params, bl31_plat_params); - die("BL31 returned!"); -} |