diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-04-12 22:23:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-12 22:23:44 +0100 |
| commit | f07d3985b86acc6abc963924d82c9ba9a795fb22 (patch) | |
| tree | 1c516dd4d561e9a71ea1fc8b9b6527b78cff0d21 /bl31 | |
| parent | 45cd814bf71b311686db9fa65f78171ba5abf02f (diff) | |
| parent | 1e09ff93444943edcebfb167202f37a5e7913d92 (diff) | |
Merge pull request #885 from antonio-nino-diaz-arm/an/console-flush
Implement console_flush()
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/crash_reporting.S | 4 | ||||
| -rw-r--r-- | bl31/bl31_main.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/bl31/aarch64/crash_reporting.S b/bl31/aarch64/crash_reporting.S index 8e603862..c6d5c6c3 100644 --- a/bl31/aarch64/crash_reporting.S +++ b/bl31/aarch64/crash_reporting.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -349,6 +349,8 @@ func do_crash_reporting /* Print some platform registers */ plat_crash_print_regs + bl plat_crash_console_flush + /* Done reporting */ no_ret plat_panic_handler endfunc do_crash_reporting diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index 85b3ea1e..c74b72b7 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -33,6 +33,7 @@ #include <assert.h> #include <bl_common.h> #include <bl31.h> +#include <console.h> #include <context_mgmt.h> #include <debug.h> #include <platform.h> @@ -129,6 +130,8 @@ void bl31_main(void) */ bl31_prepare_next_image_entry(); + console_flush(); + /* * Perform any platform specific runtime setup prior to cold boot exit * from BL31 |