rpi3: Move NS-DRAM out of the protected region

The Non-secure DRAM region shouldn't be protected in the range specified
in the Linux command line with memmap.

This change also increases the size of the Secure DRAM region.

Change-Id: I306e9e443a84b834c99739f54a534a3ca3be2424
Signed-off-by: Antonio Nino Diaz <[email protected]>

diff --git a/docs/plat/rpi3.rst b/docs/plat/rpi3.rst
index 8ad11c8363a51c7f256c4ce6e306f57961379b76..fbf753b09dd06275d49a14cf90a784b378cb5ca7 100644 (file)
--- a/docs/plat/rpi3.rst
+++ b/docs/plat/rpi3.rst
@@ -122,9 +122,9 @@ secure platform!
                |   Secure SRAM   | BL2, BL31
     0x10100000 +-----------------+
                |   Secure DRAM   | BL32 (Secure payload)
-    0x10C00000 +-----------------+
-               | Non-secure DRAM | BL33
     0x11000000 +-----------------+
+               | Non-secure DRAM | BL33
+               +-----------------+
                |                 |
                |       ...       |
                |                 |

diff --git a/plat/rpi3/include/platform_def.h b/plat/rpi3/include/platform_def.h
index 52b06b4b84c9fa6d770f5bfb0a1733007f4b8f08..4674bfb04f09508b3fcd0ecba15f4ca722ad0fe0 100644 (file)
--- a/plat/rpi3/include/platform_def.h
+++ b/plat/rpi3/include/platform_def.h
@@ -70,17 +70,17 @@
 #define PLAT_RPI3_FIP_BASE             ULL(0x00020000)
 #define PLAT_RPI3_FIP_MAX_SIZE         ULL(0x001E0000)
 
-/* We have 16M of memory reserved at at 256M */
+/* We have 16M of memory reserved starting at 256M */
 #define SEC_SRAM_BASE                  ULL(0x10000000)
 #define SEC_SRAM_SIZE                  ULL(0x00100000)
 
 #define SEC_DRAM0_BASE                 ULL(0x10100000)
-#define SEC_DRAM0_SIZE                 ULL(0x00B00000)
-
-#define NS_DRAM0_BASE                  ULL(0x10C00000)
-#define NS_DRAM0_SIZE                  ULL(0x00400000)
+#define SEC_DRAM0_SIZE                 ULL(0x00F00000)
 /* End of reserved memory */
 
+#define NS_DRAM0_BASE                  ULL(0x11000000)
+#define NS_DRAM0_SIZE                  ULL(0x01000000)
+
 /*
  * BL33 entrypoint.
  */