summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Jaszczyk <jaz@semihalf.com>2017-07-12 15:16:45 +0200
committerKostya Porotchkin <kostap@marvell.com>2017-07-19 16:35:30 +0300
commitae1dcf753afb33bb3058e7a6e27378fc647e6854 (patch)
tree71f56c24e03c7e0bff0e96e147cd2eb80bf4e187
parent1bf6d8d27667efd86d5f811c9d7540d05ff18aff (diff)
plat: marvell: increase the secure SRAM size and space for BL31 size
Since the scp_bl2 image is going to be bigger, we need to increase the size of memory required for it. It is not intuitive but BL31_SIZE is used for defining SCP_BL2 size. This can be done since the secure SRAM size is 1MB wide. Change-Id: Ida4a04d69d03376e8bbba713586b85fc66c848f6 Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com> Reviewed-on: http://vgitil04.il.marvell.com:8080/41640 Tested-by: iSoC Platform CI <ykjenk@marvell.com> Reviewed-by: Omri Itach <omrii@marvell.com>
-rw-r--r--include/plat/marvell/a3700/common/arm_def.h2
-rw-r--r--include/plat/marvell/common/board/board_marvell_def.h2
-rw-r--r--plat/marvell/a8k/common/include/platform_def.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/plat/marvell/a3700/common/arm_def.h b/include/plat/marvell/a3700/common/arm_def.h
index 1d685180..f7ace8e0 100644
--- a/include/plat/marvell/a3700/common/arm_def.h
+++ b/include/plat/marvell/a3700/common/arm_def.h
@@ -237,7 +237,7 @@
*/
#define BL31_BASE (MARVELL_BL_RAM_BASE + \
MARVELL_BL_RAM_SIZE - \
- 0x1D000)
+ 0x5D000)
#define BL31_PROGBITS_LIMIT BL1_RW_BASE
#define BL31_LIMIT (MARVELL_BL_RAM_BASE + MARVELL_BL_RAM_SIZE)
diff --git a/include/plat/marvell/common/board/board_marvell_def.h b/include/plat/marvell/common/board/board_marvell_def.h
index 90706bb8..6853f88f 100644
--- a/include/plat/marvell/common/board/board_marvell_def.h
+++ b/include/plat/marvell/common/board/board_marvell_def.h
@@ -125,7 +125,7 @@
#define MAX_IO_DEVICES 3
#define MAX_IO_HANDLES 4
-#define PLAT_MARVELL_TRUSTED_SRAM_SIZE 0x40000 /* 256 KB */
+#define PLAT_MARVELL_TRUSTED_SRAM_SIZE 0x80000 /* 512 KB */
#endif /* __BOARD_MARVELL_DEF_H__ */
diff --git a/plat/marvell/a8k/common/include/platform_def.h b/plat/marvell/a8k/common/include/platform_def.h
index 2eade339..6c8f7db1 100644
--- a/plat/marvell/a8k/common/include/platform_def.h
+++ b/plat/marvell/a8k/common/include/platform_def.h
@@ -145,7 +145,7 @@
* PLAT_ARM_MAX_BL31_SIZE is calculated using the current BL31 debug size plus a
* little space for growth.
*/
-#define PLAT_MARVEL_MAX_BL31_SIZE 0x1D000
+#define PLAT_MARVEL_MAX_BL31_SIZE 0x5D000
#define PLAT_MARVELL_CPU_ENTRY_ADDR BL1_RO_BASE