diff options
| author | danh-arm <dan.handley@arm.com> | 2015-12-14 18:00:27 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-12-14 18:00:27 +0000 |
| commit | 31d5e7f56ea66d2b540fcb25fb27b930dfc45221 (patch) | |
| tree | d5cc70b9270853267cfbb213b1d65b39c0d2899d /plat/arm/css/common/css_scp_bootloader.c | |
| parent | a84deb9c3fe5396d580b695acc09a75d67332559 (diff) | |
| parent | d178637d2bac46ef0d227395663c55cc46a25d73 (diff) | |
Merge pull request #467 from jcastillo-arm/jc/tbb_oid
Apply new image terminology
Diffstat (limited to 'plat/arm/css/common/css_scp_bootloader.c')
| -rw-r--r-- | plat/arm/css/common/css_scp_bootloader.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |