From d178637d2bac46ef0d227395663c55cc46a25d73 Mon Sep 17 00:00:00 2001 From: Juan Castillo Date: Mon, 14 Dec 2015 09:35:25 +0000 Subject: 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 --- include/plat/common/common_def.h | 2 +- include/plat/common/platform.h | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'include/plat/common') diff --git a/include/plat/common/common_def.h b/include/plat/common/common_def.h index 4175b145..744c22eb 100644 --- a/include/plat/common/common_def.h +++ b/include/plat/common/common_def.h @@ -55,7 +55,7 @@ * avoid subtle integer overflow errors due to implicit integer type promotion * when working with 32-bit values. * - * The TSP linker script includes some of these definitions to define the BL3-2 + * The TSP linker script includes some of these definitions to define the BL32 * memory map, but the GNU LD does not support the 'ull' suffix, causing the * build process to fail. To solve this problem, the auxiliary macro MAKE_ULL(x) * will add the 'ull' suffix only when the macro __LINKER__ is not defined diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index b6a037f2..c21f9ee8 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -134,7 +134,7 @@ struct meminfo *bl2_plat_sec_mem_layout(void); /* * This function returns a pointer to the shared memory that the platform has - * kept aside to pass trusted firmware related information that BL3-1 + * kept aside to pass trusted firmware related information that BL31 * could need */ struct bl31_params *bl2_plat_get_bl31_params(void); @@ -147,14 +147,14 @@ struct entry_point_info *bl2_plat_get_bl31_ep_info(void); /* * This function flushes to main memory all the params that are - * passed to BL3-1 + * passed to BL31 */ void bl2_plat_flush_bl31_params(void); /* * The next 2 functions allow the platform to change the entrypoint information - * for the mandatory 3rd level BL images, BL3-1 and BL3-3. This is done after - * BL2 has loaded those images into memory but before BL3-1 is executed. + * for the mandatory 3rd level BL images, BL31 and BL33. This is done after + * BL2 has loaded those images into memory but before BL31 is executed. */ void bl2_plat_set_bl31_ep_info(struct image_info *image, struct entry_point_info *ep); @@ -162,7 +162,7 @@ void bl2_plat_set_bl31_ep_info(struct image_info *image, void bl2_plat_set_bl33_ep_info(struct image_info *image, struct entry_point_info *ep); -/* Gets the memory layout for BL3-3 */ +/* Gets the memory layout for BL33 */ void bl2_plat_get_bl33_meminfo(struct meminfo *mem_info); /******************************************************************************* @@ -179,13 +179,13 @@ void bl2_plat_get_scp_bl2_meminfo(struct meminfo *mem_info); int bl2_plat_handle_scp_bl2(struct image_info *scp_bl2_image_info); /******************************************************************************* - * Conditionally mandatory BL2 functions: must be implemented if BL3-2 image + * Conditionally mandatory BL2 functions: must be implemented if BL32 image * is supported ******************************************************************************/ void bl2_plat_set_bl32_ep_info(struct image_info *image, struct entry_point_info *ep); -/* Gets the memory layout for BL3-2 */ +/* Gets the memory layout for BL32 */ void bl2_plat_get_bl32_meminfo(struct meminfo *mem_info); /******************************************************************************* @@ -210,7 +210,7 @@ void bl2u_platform_setup(void); int bl2u_plat_handle_scp_bl2u(void); /******************************************************************************* - * Mandatory BL3-1 functions + * Mandatory BL31 functions ******************************************************************************/ void bl31_early_platform_setup(struct bl31_params *from_bl2, void *plat_params_from_bl2); @@ -220,26 +220,26 @@ void bl31_plat_runtime_setup(void); struct entry_point_info *bl31_plat_get_next_image_ep_info(uint32_t type); /******************************************************************************* - * Mandatory PSCI functions (BL3-1) + * Mandatory PSCI functions (BL31) ******************************************************************************/ int plat_setup_psci_ops(uintptr_t sec_entrypoint, const struct plat_psci_ops **); const unsigned char *plat_get_power_domain_tree_desc(void); /******************************************************************************* - * Optional PSCI functions (BL3-1). + * Optional PSCI functions (BL31). ******************************************************************************/ plat_local_state_t plat_get_target_pwr_state(unsigned int lvl, const plat_local_state_t *states, unsigned int ncpu); /******************************************************************************* - * Optional BL3-1 functions (may be overridden) + * Optional BL31 functions (may be overridden) ******************************************************************************/ void bl31_plat_enable_mmu(uint32_t flags); /******************************************************************************* - * Optional BL3-2 functions (may be overridden) + * Optional BL32 functions (may be overridden) ******************************************************************************/ void bl32_plat_enable_mmu(uint32_t flags); @@ -261,7 +261,7 @@ int plat_get_rotpk_info(void *cookie, void **key_ptr, unsigned int *key_len, unsigned int platform_get_core_pos(unsigned long mpidr); /******************************************************************************* - * Mandatory PSCI Compatibility functions (BL3-1) + * Mandatory PSCI Compatibility functions (BL31) ******************************************************************************/ int platform_setup_pm(const plat_pm_ops_t **); -- cgit v1.2.3