aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchin Gupta <achin.gupta@arm.com>2014-01-18 16:26:30 +0000
committerDan Handley <dan.handley@arm.com>2014-01-20 18:45:04 +0000
commit5443f2be407f23a19c31564121683ddc24b982e8 (patch)
tree9807a0f393b347f6d83ea9bb8e2522589254d765
parent3a4cae051af8fb129054c0aaf14dd3b7247f04f0 (diff)
downloadarm-trusted-firmware-5443f2be407f23a19c31564121683ddc24b982e8.tar.gz
remove empty definition of display_boot_progress()
This patch replaces the empty definition of display_boot_progress() in bl2_main.c with a weak definition. The former allowed bl2 to use the early_exceptions(). It is possible to do that with a simple weak definition as well. Change-Id: Idb3f425a5e265f3579b638e3d26bd8c9bb78f80d
-rw-r--r--bl1/aarch64/early_exceptions.S14
-rw-r--r--bl2/bl2_main.c14
2 files changed, 13 insertions, 15 deletions
diff --git a/bl1/aarch64/early_exceptions.S b/bl1/aarch64/early_exceptions.S
index d2e65b0..bc3e946 100644
--- a/bl1/aarch64/early_exceptions.S
+++ b/bl1/aarch64/early_exceptions.S
@@ -35,7 +35,7 @@
#include <runtime_svc.h>
.globl early_exceptions
-
+ .weak display_boot_progress
.section .text, "ax"; .align 11
@@ -214,3 +214,15 @@ SErrorA32:
mov x0, #SERROR_AARCH32
bl plat_report_exception
b SErrorA32
+
+ .align 7
+ /* -----------------------------------------------------
+ * BL1 redefines this function to print the fact that
+ * BL2 has done its job and BL31 is about to be loaded.
+ * This weak definition allows other bootloader stages
+ * to use the 'early_exceptions' without running into
+ * compilation errors.
+ * -----------------------------------------------------
+ */
+display_boot_progress:
+ ret
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c
index 856493b..018a21f 100644
--- a/bl2/bl2_main.c
+++ b/bl2/bl2_main.c
@@ -128,17 +128,3 @@ void bl2_main(void)
/* There is no valid reason for run_image() to return */
assert(0);
}
-
-/*******************************************************************************
- * BL1 has this function to print the fact that BL2 has done its job and BL31 is
- * about to be loaded. Since BL2 re-uses BL1's exception table, it needs to
- * define this function as well.
- * TODO: Remove this function from BL2.
- ******************************************************************************/
-void display_boot_progress(unsigned long entrypoint,
- unsigned long spsr,
- unsigned long mem_layout,
- unsigned long ns_image_info)
-{
- return;
-}