plat: marvell: armada: adjust trusted DRAM size to match OP-TEE OS

Area used as trusted DRAM is 12MB in Marvell OP-TEE OS module.
It is followed by 4MB of shared memory.

Change-Id: If8edeeec5861b529408baca25f78c06a0a440d8c
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>

diff --git a/plat/marvell/armada/a3k/common/include/platform_def.h b/plat/marvell/armada/a3k/common/include/platform_def.h
index 7f8f79a45e917d1fda18c0ece9df05e425f2678d..61c7dfe706c64eb9bd5eba3428c117936ae70479 100644 (file)
--- a/plat/marvell/armada/a3k/common/include/platform_def.h
+++ b/plat/marvell/armada/a3k/common/include/platform_def.h
@@ -83,9 +83,11 @@
 #define PLAT_MARVELL_TRUSTED_ROM_BASE          PLAT_MARVELL_ATF_LOAD_ADDR
 /* 4 MB for FIP image */
 #define PLAT_MARVELL_TRUSTED_ROM_SIZE          0x00400000
-/* Reserve 16M for SCP (Secure PayLoad) Trusted DRAM */
+/* Reserve 12M for SCP (Secure PayLoad) Trusted RAM
+ * OP-TEE SHMEM follows this region
+ */
 #define PLAT_MARVELL_TRUSTED_RAM_BASE          0x04400000
-#define PLAT_MARVELL_TRUSTED_RAM_SIZE          0x01000000      /* 16 MB */
+#define PLAT_MARVELL_TRUSTED_RAM_SIZE          0x00C00000      /* 12 MB DRAM */
 
 /*
  * PLAT_ARM_MAX_BL1_RW_SIZE is calculated using the current BL1 RW debug size

diff --git a/plat/marvell/armada/a8k/common/include/platform_def.h b/plat/marvell/armada/a8k/common/include/platform_def.h
index b26e3ea1ed17d776709341e3902b94e1a3ff3399..cbef3a173c8d861736f42b672b2fcdd1f5ae5de0 100644 (file)
--- a/plat/marvell/armada/a8k/common/include/platform_def.h
+++ b/plat/marvell/armada/a8k/common/include/platform_def.h
@@ -96,9 +96,11 @@
 #define PLAT_MARVELL_TRUSTED_ROM_BASE          PLAT_MARVELL_ATF_LOAD_ADDR
 /* 4 MB for FIP image */
 #define PLAT_MARVELL_TRUSTED_ROM_SIZE          0x00400000
-/* Reserve 16M for SCP (Secure PayLoad) Trusted RAM */
+/* Reserve 12M for SCP (Secure PayLoad) Trusted RAM
+ * OP-TEE SHMEM follows this region
+ */
 #define PLAT_MARVELL_TRUSTED_RAM_BASE          0x04400000
-#define PLAT_MARVELL_TRUSTED_RAM_SIZE          0x01000000      /* 16 MB DRAM */
+#define PLAT_MARVELL_TRUSTED_RAM_SIZE          0x00C00000      /* 12 MB DRAM */
 
 #define PLAT_MARVELL_LLC_SRAM_BASE             PLAT_MARVELL_TRUSTED_RAM_BASE
 #define PLAT_MARVELL_LLC_SRAM_SIZE             0x00100000      /* 1 MB SRAM */