diff options
| author | Scott Branden <sbranden@users.noreply.github.com> | 2017-04-29 08:36:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 08:36:12 -0700 |
| commit | 0f22bef31d402e24fab77eb2a3c643d042b7e79c (patch) | |
| tree | 6595ed7f87249ccbd4a953ba5cdc00963a130d18 /bl1/bl1_main.c | |
| parent | 53d9c9c85bc49845c4c40315e1ab29d627a1f8c3 (diff) | |
| parent | dd454b40dfe42dbf77e2f04a3965295380b4f78d (diff) | |
Merge branch 'integration' into tf_issue_461
Diffstat (limited to 'bl1/bl1_main.c')
| -rw-r--r-- | bl1/bl1_main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index 90c06afe..ebeb39ea 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -34,6 +34,7 @@ #include <auth_mod.h> #include <bl1.h> #include <bl_common.h> +#include <console.h> #include <debug.h> #include <errata_report.h> #include <platform.h> @@ -113,7 +114,7 @@ void bl1_main(void) print_errata_status(); -#if DEBUG +#if ENABLE_ASSERTIONS u_register_t val; /* * Ensure that MMU/Caches and coherency are turned on @@ -140,7 +141,7 @@ void bl1_main(void) assert(CACHE_WRITEBACK_GRANULE == SIZE_FROM_LOG2_WORDS(val)); else assert(CACHE_WRITEBACK_GRANULE <= MAX_CACHE_LINE_SIZE); -#endif +#endif /* ENABLE_ASSERTIONS */ /* Perform remaining generic architectural setup from EL3 */ bl1_arch_setup(); @@ -166,6 +167,8 @@ void bl1_main(void) NOTICE("BL1-FWU: *******FWU Process Started*******\n"); bl1_prepare_next_image(image_id); + + console_flush(); } /******************************************************************************* |