From 6ad2e461f0cd6de5aefd89fa0ba7acf2c293b8c2 Mon Sep 17 00:00:00 2001 From: Dan Handley Date: Tue, 29 Jul 2014 17:14:00 +0100 Subject: 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 --- lib/stdlib/abort.c | 6 +++--- lib/stdlib/assert.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/stdlib') 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 +#include /* * 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); } -- cgit