Skip to content

GitLab

Commit 6428938f authored by Mark Dykes's avatar Mark Dykes Committed by TrustedFirmware Code Review
Browse files

Merge "juno/sgm: Align SCP_BL2 to page boundary" into integration

parents e822372a 868a7d1e
Show whitespace changes
Inline Side-by-side
plat/arm/board/juno/include/platform_def.h
View file @ 6428938f
...@@ -253,7 +253,9 @@ ...@@ -253,7 +253,9 @@
* anything else in this memory region and is handed over to the SCP before * anything else in this memory region and is handed over to the SCP before
* BL31 is loaded over the top. * BL31 is loaded over the top.
*/ */
#define PLAT_CSS_MAX_SCP_BL2_SIZE (SCP_BL2_LIMIT - ARM_TB_FW_CONFIG_LIMIT) #define PLAT_CSS_MAX_SCP_BL2_SIZE \
((SCP_BL2_LIMIT - ARM_TB_FW_CONFIG_LIMIT) & ~PAGE_SIZE_MASK)
#define PLAT_CSS_MAX_SCP_BL2U_SIZE PLAT_CSS_MAX_SCP_BL2_SIZE #define PLAT_CSS_MAX_SCP_BL2U_SIZE PLAT_CSS_MAX_SCP_BL2_SIZE
#define PLAT_ARM_G1S_IRQ_PROPS(grp) \ #define PLAT_ARM_G1S_IRQ_PROPS(grp) \
......
plat/arm/css/sgm/include/sgm_base_platform_def.h
View file @ 6428938f
...@@ -137,7 +137,9 @@ ...@@ -137,7 +137,9 @@
* anything else in this memory region and is handed over to the SCP before * anything else in this memory region and is handed over to the SCP before
* BL31 is loaded over the top. * BL31 is loaded over the top.
*/ */
#define PLAT_CSS_MAX_SCP_BL2_SIZE (SCP_BL2_LIMIT - ARM_TB_FW_CONFIG_LIMIT) #define PLAT_CSS_MAX_SCP_BL2_SIZE \
((SCP_BL2_LIMIT - ARM_TB_FW_CONFIG_LIMIT) & ~PAGE_SIZE_MASK)
#define PLAT_CSS_MAX_SCP_BL2U_SIZE PLAT_CSS_MAX_SCP_BL2_SIZE #define PLAT_CSS_MAX_SCP_BL2U_SIZE PLAT_CSS_MAX_SCP_BL2_SIZE
/* /*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment