summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2018-04-26 09:53:16 +0200
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2018-06-19 14:28:01 +0000
commit59b8f275c21ccbd08019cc7d9f0b63671de6586a (patch)
tree62d5faf942ed7bc8da9016743f8d8390f7db46c7 /src/arch
parent635e512be3cc0d805c9eb924a08528a39c0d6b1e (diff)
lib/prog_loaders: Move argument selection into selfload
Set the payload argument in selfload, as other (non self) payloads, are going to set a different argument. Change-Id: I994f604fc4501e0e3b00165819f796b1b8275d8c Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/25861 Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm64/arm_tf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c
index a172d42ab3..88416ea27d 100644
--- a/src/arch/arm64/arm_tf.c
+++ b/src/arch/arm64/arm_tf.c
@@ -51,9 +51,9 @@ void arm_tf_run_bl31(u64 payload_entry, u64 payload_arg0, u64 payload_spsr)
if (prog_locate(&bl31))
die("BL31 not found");
- bl31_entry = selfload(&bl31, false);
- if (!bl31_entry)
+ if (!selfload(&bl31, false))
die("BL31 load failed");
+ bl31_entry = prog_entry(&bl31);
SET_PARAM_HEAD(&bl31_params, PARAM_BL31, VERSION_1, 0);