diff options
Diffstat (limited to 'include/plat/arm/css/common')
| -rw-r--r-- | include/plat/arm/css/common/aarch64/css_macros.S | 2 | ||||
| -rw-r--r-- | include/plat/arm/css/common/css_def.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/plat/arm/css/common/aarch64/css_macros.S b/include/plat/arm/css/common/aarch64/css_macros.S index 9f18e09c..9124fdc7 100644 --- a/include/plat/arm/css/common/aarch64/css_macros.S +++ b/include/plat/arm/css/common/aarch64/css_macros.S @@ -36,7 +36,7 @@ /* --------------------------------------------- * The below required platform porting macro * prints out relevant GIC registers whenever an - * unhandled exception is taken in BL3-1. + * unhandled exception is taken in BL31. * Clobbers: x0 - x10, x16, x17, sp * --------------------------------------------- */ diff --git a/include/plat/arm/css/common/css_def.h b/include/plat/arm/css/common/css_def.h index 3fa4c153..c900278b 100644 --- a/include/plat/arm/css/common/css_def.h +++ b/include/plat/arm/css/common/css_def.h @@ -82,7 +82,7 @@ * primary, according to the shift and mask definitions below. * * Note that the value stored at this address is only valid at boot time, before - * the BL3-0 image is transferred to SCP. + * the SCP_BL2 image is transferred to SCP. */ #define SCP_BOOT_CFG_ADDR (ARM_TRUSTED_SRAM_BASE + 0x80) #define PRIMARY_CPU_SHIFT 8 @@ -110,11 +110,11 @@ ************************************************************************/ /* - * Load address of BL3-0 in CSS platform ports - * BL3-0 is loaded to the same place as BL3-1. Once BL3-0 is transferred to the - * SCP, it is discarded and BL3-1 is loaded over the top. + * Load address of SCP_BL2 in CSS platform ports + * SCP_BL2 is loaded to the same place as BL31. Once SCP_BL2 is transferred to the + * SCP, it is discarded and BL31 is loaded over the top. */ -#define BL30_BASE BL31_BASE +#define SCP_BL2_BASE BL31_BASE #define SCP_BL2U_BASE BL31_BASE |