diff options
| author | Juan Castillo <juan.castillo@arm.com> | 2015-12-14 09:35:25 +0000 |
|---|---|---|
| committer | Juan Castillo <juan.castillo@arm.com> | 2015-12-14 12:31:37 +0000 |
| commit | d178637d2bac46ef0d227395663c55cc46a25d73 (patch) | |
| tree | d5cc70b9270853267cfbb213b1d65b39c0d2899d /bl31 | |
| parent | f59821d51255f14e0ac00eef7bc98ef75c686876 (diff) | |
Remove dashes from image names: 'BL3-x' --> 'BL3x'
This patch removes the dash character from the image name, to
follow the image terminology in the Trusted Firmware Wiki page:
https://github.com/ARM-software/arm-trusted-firmware/wiki
Changes apply to output messages, comments and documentation.
non-ARM platform files have been left unmodified.
Change-Id: Ic2a99be4ed929d52afbeb27ac765ceffce46ed76
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 2 | ||||
| -rw-r--r-- | bl31/bl31.ld.S | 4 | ||||
| -rw-r--r-- | bl31/bl31.mk | 2 | ||||
| -rw-r--r-- | bl31/bl31_main.c | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index 45aa85dc..1c8eed9d 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -91,7 +91,7 @@ func bl31_entrypoint _exception_vectors=runtime_exceptions /* --------------------------------------------------------------------- - * For RESET_TO_BL31 systems, BL3-1 is the first bootloader to run so + * For RESET_TO_BL31 systems, BL31 is the first bootloader to run so * there's no argument to relay from a previous bootloader. Zero the * arguments passed to the platform layer to reflect that. * --------------------------------------------------------------------- diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index e572f9be..dc6e7a46 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -94,7 +94,7 @@ SECTIONS } >RAM #ifdef BL31_PROGBITS_LIMIT - ASSERT(. <= BL31_PROGBITS_LIMIT, "BL3-1 progbits has exceeded its limit.") + ASSERT(. <= BL31_PROGBITS_LIMIT, "BL31 progbits has exceeded its limit.") #endif stacks (NOLOAD) : { @@ -184,5 +184,5 @@ SECTIONS __COHERENT_RAM_END_UNALIGNED__ - __COHERENT_RAM_START__; #endif - ASSERT(. <= BL31_LIMIT, "BL3-1 image has exceeded its limit.") + ASSERT(. <= BL31_LIMIT, "BL31 image has exceeded its limit.") } diff --git a/bl31/bl31.mk b/bl31/bl31.mk index 0c2b631a..8951159f 100644 --- a/bl31/bl31.mk +++ b/bl31/bl31.mk @@ -62,7 +62,7 @@ endif BL31_LINKERFILE := bl31/bl31.ld.S # Flag used to inidicate if Crash reporting via console should be included -# in BL3-1. This defaults to being present in DEBUG builds only +# in BL31. This defaults to being present in DEBUG builds only ifndef CRASH_REPORTING CRASH_REPORTING := $(DEBUG) endif diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c index f22e6121..835d41e8 100644 --- a/bl31/bl31_main.c +++ b/bl31/bl31_main.c @@ -71,8 +71,8 @@ void bl31_lib_init(void) ******************************************************************************/ void bl31_main(void) { - NOTICE("BL3-1: %s\n", version_string); - NOTICE("BL3-1: %s\n", build_message); + NOTICE("BL31: %s\n", version_string); + NOTICE("BL31: %s\n", build_message); /* Perform remaining generic architectural setup from EL3 */ bl31_arch_setup(); @@ -84,7 +84,7 @@ void bl31_main(void) bl31_lib_init(); /* Initialize the runtime services e.g. psci */ - INFO("BL3-1: Initializing runtime services\n"); + INFO("BL31: Initializing runtime services\n"); runtime_svc_init(); /* @@ -101,7 +101,7 @@ void bl31_main(void) * If SPD had registerd an init hook, invoke it. */ if (bl32_init) { - INFO("BL3-1: Initializing BL3-2\n"); + INFO("BL31: Initializing BL32\n"); (*bl32_init)(); } /* @@ -153,7 +153,7 @@ void bl31_prepare_next_image_entry(void) assert(next_image_info); assert(image_type == GET_SECURITY_STATE(next_image_info->h.attr)); - INFO("BL3-1: Preparing for EL3 exit to %s world\n", + INFO("BL31: Preparing for EL3 exit to %s world\n", (image_type == SECURE) ? "secure" : "normal"); print_entry_point_info(next_image_info); cm_init_my_context(next_image_info); |