commit 1c277c8f76bf3b6aad29f549c5b3c1e897ad7cb0
author Mark Dykes <mardyk01@review.trustedfirmware.org> Fri Apr 17 15:25:21 2020 +0000
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Fri Apr 17 15:25:21 2020 +0000
tree 09190ee7d8638100f083ad7fc8de753cc16a53d0
parent 6808d80e4b928ada15fbd618bc31ddb4deec903f
parent 8ab69c881de4a67018fdb61a1c5e45335da7eb1a

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

plat/arm/board/juno/include/platform_def.h

diff --git a/plat/arm/board/juno/include/platform_def.h b/plat/arm/board/juno/include/platform_def.h
index 43c267d..67802d4 100644
--- a/plat/arm/board/juno/include/platform_def.h
+++ b/plat/arm/board/juno/include/platform_def.h
@@ -253,7 +253,9 @@
  * 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	(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_ARM_G1S_IRQ_PROPS(grp) \

plat/arm/css/sgm/include/sgm_base_platform_def.h

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 12fa07f..8be0b34 100644
--- a/plat/arm/css/sgm/include/sgm_base_platform_def.h
+++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h
@@ -137,7 +137,9 @@
  * 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	(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
 
 /*