diff options
Diffstat (limited to 'plat/arm/css/common')
| -rw-r--r-- | plat/arm/css/common/css_bl2_setup.c | 18 | ||||
| -rw-r--r-- | plat/arm/css/common/css_common.mk | 6 | ||||
| -rw-r--r-- | plat/arm/css/common/css_scp_bootloader.c | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/plat/arm/css/common/css_bl2_setup.c b/plat/arm/css/common/css_bl2_setup.c index 6054f7a5..15db8d1c 100644 --- a/plat/arm/css/common/css_bl2_setup.c +++ b/plat/arm/css/common/css_bl2_setup.c @@ -37,25 +37,25 @@ #include "css_scp_bootloader.h" /* Weak definition may be overridden in specific CSS based platform */ -#pragma weak bl2_plat_handle_bl30 +#pragma weak bl2_plat_handle_scp_bl2 /******************************************************************************* - * Transfer BL3-0 from Trusted RAM using the SCP Download protocol. + * Transfer SCP_BL2 from Trusted RAM using the SCP Download protocol. * Return 0 on success, -1 otherwise. ******************************************************************************/ -int bl2_plat_handle_bl30(image_info_t *bl30_image_info) +int bl2_plat_handle_scp_bl2(image_info_t *scp_bl2_image_info) { int ret; - INFO("BL2: Initiating BL3-0 transfer to SCP\n"); + INFO("BL2: Initiating SCP_BL2 transfer to SCP\n"); - ret = scp_bootloader_transfer((void *)bl30_image_info->image_base, - bl30_image_info->image_size); + ret = scp_bootloader_transfer((void *)scp_bl2_image_info->image_base, + scp_bl2_image_info->image_size); if (ret == 0) - INFO("BL2: BL3-0 transferred to SCP\n"); + INFO("BL2: SCP_BL2 transferred to SCP\n"); else - ERROR("BL2: BL3-0 transfer failure\n"); + ERROR("BL2: SCP_BL2 transfer failure\n"); return ret; } @@ -72,7 +72,7 @@ void bl2_early_platform_setup(meminfo_t *mem_layout) { arm_bl2_early_platform_setup(mem_layout); - /* Save SCP Boot config before it gets overwritten by BL30 loading */ + /* Save SCP Boot config before it gets overwritten by SCP_BL2 loading */ scp_boot_config = mmio_read_32(SCP_BOOT_CFG_ADDR); VERBOSE("BL2: Saved SCP Boot config = 0x%x\n", scp_boot_config); } diff --git a/plat/arm/css/common/css_common.mk b/plat/arm/css/common/css_common.mk index 49fedc3a..aabcb46e 100644 --- a/plat/arm/css/common/css_common.mk +++ b/plat/arm/css/common/css_common.mk @@ -56,12 +56,12 @@ $(eval $(call FWU_FIP_ADD_IMG,SCP_BL2U,--scp_bl2u)) endif ifneq (${RESET_TO_BL31},0) - $(error "Using BL3-1 as the reset vector is not supported on CSS platforms. \ + $(error "Using BL31 as the reset vector is not supported on CSS platforms. \ Please set RESET_TO_BL31 to 0.") endif -# Subsystems require a BL30 image -$(eval $(call FIP_ADD_IMG,BL30,--bl30)) +# Subsystems require a SCP_BL2 image +$(eval $(call FIP_ADD_IMG,SCP_BL2,--scp_bl2)) # Enable option to detect whether the SCP ROM firmware in use predates version # 1.7.0 and therefore, is incompatible. diff --git a/plat/arm/css/common/css_scp_bootloader.c b/plat/arm/css/common/css_scp_bootloader.c index acc7351c..c01f42fb 100644 --- a/plat/arm/css/common/css_scp_bootloader.c +++ b/plat/arm/css/common/css_scp_bootloader.c @@ -118,10 +118,10 @@ int scp_bootloader_transfer(void *image, unsigned int image_size) cmd_info_payload_t *cmd_info_payload; cmd_data_payload_t *cmd_data_payload; - assert((uintptr_t) image == BL30_BASE); + assert((uintptr_t) image == SCP_BL2_BASE); if ((image_size == 0) || (image_size % 4 != 0)) { - ERROR("Invalid size for the BL3-0 image. Must be a multiple of " + ERROR("Invalid size for the SCP_BL2 image. Must be a multiple of " "4 bytes and not zero (current size = 0x%x)\n", image_size); return -1; @@ -134,7 +134,7 @@ int scp_bootloader_transfer(void *image, unsigned int image_size) mhu_secure_init(); - VERBOSE("Send info about the BL3-0 image to be transferred to SCP\n"); + VERBOSE("Send info about the SCP_BL2 image to be transferred to SCP\n"); /* * Send information about the SCP firmware image about to be transferred @@ -174,9 +174,9 @@ int scp_bootloader_transfer(void *image, unsigned int image_size) return -1; } - VERBOSE("Transferring BL3-0 image to SCP\n"); + VERBOSE("Transferring SCP_BL2 image to SCP\n"); - /* Transfer BL3-0 image to SCP */ + /* Transfer SCP_BL2 image to SCP */ scp_boot_message_start(); BOM_CMD_HEADER->id = BOOT_CMD_DATA; |