rpi3: enlarge SEC_DRAM0_SIZE for optee_test to pass

Running optee_test failed because SEC_DRAM0_SIZE is too small. Previous
is 2 MB. We enlarge it to 11 MB for passing the test. Also we reduce
the NS_DRAM0_SIZE from 13MB to 4MB so that the whole section is still
fit in 16MB.

This commit also modified the document to reflect the changes we've
made in code.

Tested-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Signed-off-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>

diff --git a/docs/plat/rpi3.rst b/docs/plat/rpi3.rst
index c8e2405cc0e242b34b18de326624e8e4fab73fbe..cb965c97f8858536a675780a3dc83a893256648a 100644 (file)
--- a/docs/plat/rpi3.rst
+++ b/docs/plat/rpi3.rst
@@ -123,7 +123,7 @@ secure platform!
                |   Secure SRAM   | BL2, BL31
     0x10100000 +-----------------+
                |   Secure DRAM   | BL32 (Secure payload)
-    0x10300000 +-----------------+
+    0x10C00000 +-----------------+
                | Non-secure DRAM | BL33
     0x11000000 +-----------------+
                |                 |

diff --git a/plat/rpi3/include/platform_def.h b/plat/rpi3/include/platform_def.h
index 2cd0dff259dd5d028518a6ecfe4c6588f7ebef36..5b84aa617416178f9a28e302eb023bcd10b1cddd 100644 (file)
--- a/plat/rpi3/include/platform_def.h
+++ b/plat/rpi3/include/platform_def.h
@@ -75,10 +75,10 @@
 #define SEC_SRAM_SIZE                  ULL(0x00100000)
 
 #define SEC_DRAM0_BASE                 ULL(0x10100000)
-#define SEC_DRAM0_SIZE                 ULL(0x00200000)
+#define SEC_DRAM0_SIZE                 ULL(0x00B00000)
 
-#define NS_DRAM0_BASE                  ULL(0x10300000)
-#define NS_DRAM0_SIZE                  ULL(0x00D00000)
+#define NS_DRAM0_BASE                  ULL(0x10C00000)
+#define NS_DRAM0_SIZE                  ULL(0x00400000)
 /* End of reserved memory */
 
 /*