andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

juno/sgm: Maximize space allocated to SCP_BL2 

To accommodate the increasing size of the SCP_BL2 binary, the base
address of the memory region allocated to SCP_BL2 has been moved
downwards from its current (mostly) arbitrary address to the beginning
of the non-shared trusted SRAM.

Change-Id: I086a3765bf3ea88f45525223d765dc0dbad6b434
Signed-off-by: Chris Kay <chris.kay@arm.com>
This commit is contained in:
Chris Kay 2020-03-12 13:50:26 +00:00
parent f9ea3a6291
commit ddc93cbaa4
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/design/firmware-design.rst
View File

@ -1859,7 +1859,7 @@ BL image during boot.
| BL2 | <<<<<<<<<<<<< | | | BL2 | <<<<<<<<<<<<< | |
|----------| <<<<<<<<<<<<< |----------------| |----------| <<<<<<<<<<<<< |----------------|
| SCP_BL2 | <<<<<<<<<<<<< | BL31 PROGBITS | | SCP_BL2 | <<<<<<<<<<<<< | BL31 PROGBITS |
|----------| <<<<<<<<<<<<< |----------------| | | <<<<<<<<<<<<< |----------------|
| | <<<<<<<<<<<<< | BL32 | | | <<<<<<<<<<<<< | BL32 |
| | +----------------+ | | +----------------+
| | | |
@ -1896,7 +1896,7 @@ BL image during boot.
| BL2 | <<<<<<<<<<<<< | | | BL2 | <<<<<<<<<<<<< | |
|----------| <<<<<<<<<<<<< |----------------| |----------| <<<<<<<<<<<<< |----------------|
| SCP_BL2 | <<<<<<<<<<<<< | BL31 PROGBITS | | SCP_BL2 | <<<<<<<<<<<<< | BL31 PROGBITS |
|----------| +----------------+ | | +----------------+
0x04001000 +----------+ 0x04001000 +----------+
| MHU | | MHU |
0x04000000 +----------+ 0x04000000 +----------+

14
plat/arm/board/juno/include/platform_def.h
View File

@ -249,16 +249,12 @@
#endif #endif
/* /*
* PLAT_CSS_MAX_SCP_BL2_SIZE is calculated using the current * SCP_BL2 uses up whatever remaining space is available as it is loaded before
* SCP_BL2 size plus a little space for growth. * 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) #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
/*
* 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_ARM_G1S_IRQ_PROPS(grp) \ #define PLAT_ARM_G1S_IRQ_PROPS(grp) \
CSS_G1S_IRQ_PROPS(grp), \ CSS_G1S_IRQ_PROPS(grp), \

14
plat/arm/css/sgm/include/sgm_base_platform_def.h
View File

@ -133,16 +133,12 @@
#endif #endif
/* /*
* PLAT_CSS_MAX_SCP_BL2_SIZE is calculated using the current * SCP_BL2 uses up whatever remaining space is available as it is loaded before
* SCP_BL2 size plus a little space for growth. * 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 #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
/*
* 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
/* /*
* Most platform porting definitions provided by included headers * Most platform porting definitions provided by included headers