diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-01-19 13:40:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-19 13:40:12 +0000 |
| commit | 0d3a27e7f6ee3fa1be4c705927bcf9cad3750809 (patch) | |
| tree | 6ff8104078387889e039eb2e7a0e9cf87fac4691 /bl2/bl2_main.c | |
| parent | 0caaa03bf182429e40d8785e4a9017c443841a52 (diff) | |
| parent | 76d267334626312adf48c8aad52a0f4178e64d61 (diff) | |
Merge pull request #1200 from robertovargas-arm/bl2-el3
Add BL2_AT_EL3 build option
Diffstat (limited to 'bl2/bl2_main.c')
| -rw-r--r-- | bl2/bl2_main.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c index 018deb34..c85db2d4 100644 --- a/bl2/bl2_main.c +++ b/bl2/bl2_main.c @@ -13,6 +13,11 @@ #include <platform.h> #include "bl2_private.h" +#ifdef AARCH32 +#define NEXT_IMAGE "BL32" +#else +#define NEXT_IMAGE "BL31" +#endif /******************************************************************************* * The only thing to do in BL2 is to load further images and pass control to @@ -49,6 +54,8 @@ void bl2_main(void) disable_mmu_icache_secure(); #endif /* AARCH32 */ + +#if !BL2_AT_EL3 console_flush(); /* @@ -57,4 +64,11 @@ void bl2_main(void) * be passed to next BL image as an argument. */ smc(BL1_SMC_RUN_IMAGE, (unsigned long)next_bl_ep_info, 0, 0, 0, 0, 0, 0); +#else + NOTICE("BL2: Booting " NEXT_IMAGE "\n"); + print_entry_point_info(next_bl_ep_info); + console_flush(); + + bl2_run_next_image(next_bl_ep_info); +#endif } |