diff options
author | Dan Handley <dan.handley@arm.com> | 2014-07-29 17:14:00 +0100 |
---|---|---|
committer | Dan Handley <dan.handley@arm.com> | 2014-08-12 16:51:18 +0100 |
commit | 6ad2e461f0cd6de5aefd89fa0ba7acf2c293b8c2 (patch) | |
tree | 34526feccbb67e86b844c3b5b03839b31322b561 /lib/stdlib | |
parent | 289c28a8f5954bd548e6ab9ac8515479981fb6d1 (diff) |
Rationalize console log output
Fix the following issues with the console log output:
* Make sure the welcome string is the first thing in the log output
(during normal boot).
* Prefix each message with the BL image name so it's clear which
BL the output is coming from.
* Ensure all output is wrapped in one of the log output macros so it can
be easily compiled out if necessary. Change some of the INFO() messages
to VERBOSE(), especially in the TSP.
* Create some extra NOTICE() and INFO() messages during cold boot.
* Remove all usage of \r in log output.
Fixes ARM-software/tf-issues#231
Change-Id: Ib24f7acb36ce64bbba549f204b9cde2dbb46c8a3
Diffstat (limited to 'lib/stdlib')
-rw-r--r-- | lib/stdlib/abort.c | 6 | ||||
-rw-r--r-- | lib/stdlib/assert.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/stdlib/abort.c b/lib/stdlib/abort.c index 2ef3beea..862bf9c4 100644 --- a/lib/stdlib/abort.c +++ b/lib/stdlib/abort.c @@ -28,13 +28,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <stdio.h> +#include <debug.h> /* * This is a basic implementation. This could be improved. */ void abort (void) { - printf("ABORT\n\r"); - while(1); + ERROR("ABORT\n"); + panic(); } diff --git a/lib/stdlib/assert.c b/lib/stdlib/assert.c index c614854f..90a1afe5 100644 --- a/lib/stdlib/assert.c +++ b/lib/stdlib/assert.c @@ -36,6 +36,6 @@ void __assert (const char *function, const char *file, unsigned int line, const char *assertion) { - tf_printf("ASSERT: %s <%d> : %s\n\r", function, line, assertion); + tf_printf("ASSERT: %s <%d> : %s\n", function, line, assertion); while(1); } |