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 /common/bl_common.c | |
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 'common/bl_common.c')
-rw-r--r-- | common/bl_common.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/common/bl_common.c b/common/bl_common.c index d2c60eff..60f8b2f7 100644 --- a/common/bl_common.c +++ b/common/bl_common.c @@ -137,7 +137,7 @@ void reserve_mem(uint64_t *free_base, size_t *free_size, if (pos == BOTTOM) *free_base = addr + size; - INFO("Reserved %u bytes (discarded %u bytes %s)\n", + VERBOSE("Reserved %u bytes (discarded %u bytes %s)\n", reserved_size, discard_size, pos == TOP ? "above" : "below"); } @@ -146,15 +146,13 @@ static void dump_load_info(unsigned long image_load_addr, unsigned long image_size, const meminfo_t *mem_layout) { -#if DEBUG - tf_printf("Trying to load image at address 0x%lx, size = 0x%lx\r\n", + INFO("Trying to load image at address 0x%lx, size = 0x%lx\n", image_load_addr, image_size); - tf_printf("Current memory layout:\r\n"); - tf_printf(" total region = [0x%lx, 0x%lx]\r\n", mem_layout->total_base, + INFO("Current memory layout:\n"); + INFO(" total region = [0x%lx, 0x%lx]\n", mem_layout->total_base, mem_layout->total_base + mem_layout->total_size); - tf_printf(" free region = [0x%lx, 0x%lx]\r\n", mem_layout->free_base, + INFO(" free region = [0x%lx, 0x%lx]\n", mem_layout->free_base, mem_layout->free_base + mem_layout->free_size); -#endif } /* Generic function to return the size of an image */ |