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 /bl2 | |
| 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 'bl2')
| -rw-r--r-- | bl2/bl2_main.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c index ca838426..51c55e01 100644 --- a/bl2/bl2_main.c +++ b/bl2/bl2_main.c @@ -59,6 +59,7 @@ static int load_bl30(void) * The entry point information is not relevant in this case as the AP * won't execute the BL3-0 image. */ + INFO("BL2: Loading BL3-0\n"); bl2_plat_get_bl30_meminfo(&bl30_mem_info); e = load_image(&bl30_mem_info, BL30_IMAGE_NAME, @@ -87,6 +88,7 @@ static int load_bl31(bl31_params_t *bl2_to_bl31_params, meminfo_t *bl2_tzram_layout; int e; + INFO("BL2: Loading BL3-1\n"); assert(bl2_to_bl31_params != NULL); assert(bl31_ep_info != NULL); @@ -125,6 +127,7 @@ static int load_bl32(bl31_params_t *bl2_to_bl31_params) #ifdef BL32_BASE meminfo_t bl32_mem_info; + INFO("BL2: Loading BL3-2\n"); assert(bl2_to_bl31_params != NULL); /* @@ -160,6 +163,7 @@ static int load_bl33(bl31_params_t *bl2_to_bl31_params) meminfo_t bl33_mem_info; int e; + INFO("BL2: Loading BL3-3\n"); assert(bl2_to_bl31_params != NULL); bl2_plat_get_bl33_meminfo(&bl33_mem_info); @@ -189,15 +193,15 @@ void bl2_main(void) entry_point_info_t *bl31_ep_info; int e; + NOTICE("BL2: %s\n", version_string); + NOTICE("BL2: %s\n", build_message); + /* Perform remaining generic architectural setup in S-EL1 */ bl2_arch_setup(); /* Perform platform setup in BL2 */ bl2_platform_setup(); - tf_printf("BL2 %s\n", version_string); - tf_printf("BL2 %s\n", build_message); - /* * Load the subsequent bootloader images */ |