diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-03-13 08:06:04 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-03-13 08:06:04 +0000 |
| commit | 4c9ad0df665cca331218bc51c24147be8b192752 (patch) | |
| tree | 64b627b8720bbc040ad33f78ecd08dc409e07fbf /plat/arm | |
| parent | e820759f1c4aadb52d6be77099478d0be8877b99 (diff) | |
| parent | ddc93cbaa42bba08afd5041822a386876518446b (diff) | |
| download | platform_external_arm-trusted-firmware-4c9ad0df665cca331218bc51c24147be8b192752.tar.gz platform_external_arm-trusted-firmware-4c9ad0df665cca331218bc51c24147be8b192752.tar.bz2 platform_external_arm-trusted-firmware-4c9ad0df665cca331218bc51c24147be8b192752.zip | |
Merge "juno/sgm: Maximize space allocated to SCP_BL2" into integration
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/board/juno/include/platform_def.h | 14 | ||||
| -rw-r--r-- | plat/arm/css/sgm/include/sgm_base_platform_def.h | 14 |
2 files changed, 10 insertions, 18 deletions
diff --git a/plat/arm/board/juno/include/platform_def.h b/plat/arm/board/juno/include/platform_def.h index cfac80182..b44639528 100644 --- a/plat/arm/board/juno/include/platform_def.h +++ b/plat/arm/board/juno/include/platform_def.h @@ -249,16 +249,12 @@ #endif /* - * PLAT_CSS_MAX_SCP_BL2_SIZE is calculated using the current - * SCP_BL2 size plus a little space for growth. + * SCP_BL2 uses up whatever remaining space is available as it is loaded before + * anything else in this memory region and is handed over to the SCP before + * BL31 is loaded over the top. */ -#define PLAT_CSS_MAX_SCP_BL2_SIZE UL(0x14000) - -/* - * PLAT_CSS_MAX_SCP_BL2U_SIZE is calculated using the current - * SCP_BL2U size plus a little space for growth. - */ -#define PLAT_CSS_MAX_SCP_BL2U_SIZE UL(0x14000) +#define PLAT_CSS_MAX_SCP_BL2_SIZE (SCP_BL2_LIMIT - ARM_TB_FW_CONFIG_LIMIT) +#define PLAT_CSS_MAX_SCP_BL2U_SIZE PLAT_CSS_MAX_SCP_BL2_SIZE #define PLAT_ARM_G1S_IRQ_PROPS(grp) \ CSS_G1S_IRQ_PROPS(grp), \ diff --git a/plat/arm/css/sgm/include/sgm_base_platform_def.h b/plat/arm/css/sgm/include/sgm_base_platform_def.h index 90511ac6a..0ac0c2b3c 100644 --- a/plat/arm/css/sgm/include/sgm_base_platform_def.h +++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h @@ -133,16 +133,12 @@ #endif /* - * PLAT_CSS_MAX_SCP_BL2_SIZE is calculated using the current - * SCP_BL2 size plus a little space for growth. + * SCP_BL2 uses up whatever remaining space is available as it is loaded before + * anything else in this memory region and is handed over to the SCP before + * BL31 is loaded over the top. */ -#define PLAT_CSS_MAX_SCP_BL2_SIZE 0x15000 - -/* - * PLAT_CSS_MAX_SCP_BL2U_SIZE is calculated using the current - * SCP_BL2U size plus a little space for growth. - */ -#define PLAT_CSS_MAX_SCP_BL2U_SIZE 0x15000 +#define PLAT_CSS_MAX_SCP_BL2_SIZE (SCP_BL2_LIMIT - ARM_TB_FW_CONFIG_LIMIT) +#define PLAT_CSS_MAX_SCP_BL2U_SIZE PLAT_CSS_MAX_SCP_BL2_SIZE /* * Most platform porting definitions provided by included headers |