Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/16584
-gerrit
commit a8fad3d002e56ff4c0376d22a2542d383c4be296 Author: Simon Glass sjg@chromium.org Date: Sat Aug 27 12:02:09 2016 -0600
arm_tf: Fix code style nits and comments
Tidy up a few things which look incorrect in this file.
BUG=chrome-os-partner:56314 BRANCH=none TEST=build for gru
Signed-off-by: Martin Roth martinroth@chromium.org Original-Commit-Id: 434e9ceb5fce69b28de577cdc3541a439871f5ed Original-Change-Id: Ida7a62ced953107c8e1723003bcb470c81de4c2f Original-Signed-off-by: Simon Glass sjg@chromium.org Original-Reviewed-on: https://chromium-review.googlesource.com/376848 Original-Commit-Ready: Simon Glass sjg@google.com Original-Reviewed-by: Julius Werner jwerner@chromium.org
Change-Id: If8c283fe8513e6120de2fd52eab539096a4e0c9b --- src/arch/arm64/arm_tf.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c index 9735e1b..1ec87c4 100644 --- a/src/arch/arm64/arm_tf.c +++ b/src/arch/arm64/arm_tf.c @@ -58,17 +58,20 @@ void arm_tf_run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr) SET_PARAM_HEAD(&bl31_params, PARAM_BL31, VERSION_1, 0);
if (IS_ENABLED(CONFIG_ARM64_USE_SECURE_OS)) { - struct prog bl32 = PROG_INIT(PROG_BL32, CONFIG_CBFS_PREFIX"/secure_os"); + struct prog bl32 = PROG_INIT(PROG_BL32, + CONFIG_CBFS_PREFIX"/secure_os");
if (prog_locate(&bl32)) - die("BL31 not found"); + die("BL32 not found");
if (cbfs_prog_stage_load(&bl32)) - die("BL31 load failed"); + die("BL32 load failed");
- SET_PARAM_HEAD(&bl32_ep_info, PARAM_EP, VERSION_1, PARAM_EP_SECURE); + 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); + bl32_ep_info.spsr = SPSR_EXCEPTION_MASK | + get_eret_el(EL1, SPSR_USE_L); bl31_params.bl32_ep_info = &bl32_ep_info; }