commit 851359604c42280dfbe4eeeeac3e0a7d9eff7853
author Antonio Nino Diaz <antonio.ninodiaz@arm.com> Sun Jul 15 11:54:42 2018 +0100
committer Antonio Nino Diaz <antonio.ninodiaz@arm.com> Mon Jul 16 15:56:42 2018 +0100
tree 4e706392bfb4ff870ab55555cb62df9debc95c99
parent 7c4ab21c0201ded1c38c576a28c5d74db979785f

rpi3: Switch addresses of kernel and DTB

In the memory map of the documentation the kernel only had 16MiB of
allocated space. This leaves very little room for growth, so the
addresses of the DTB and the kernel have been interchanged.

The documentation has been updated to reflect this change.

Change-Id: Ib6eab69f047fa88561fb755397ce3a0b356c8860
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>

docs/plat/rpi3.rst

diff --git a/docs/plat/rpi3.rst b/docs/plat/rpi3.rst
index b100256..8ad11c8 100644
--- a/docs/plat/rpi3.rst
+++ b/docs/plat/rpi3.rst
@@ -107,13 +107,13 @@
                |       ...       |
                |                 |
     0x01000000 +-----------------+
-               |     Kernel      |
+               |       DTB       | (Loaded by the VideoCore)
                +-----------------+
                |                 |
                |       ...       |
                |                 |
     0x02000000 +-----------------+
-               |       DTB       |
+               |     Kernel      | (Loaded by the VideoCore)
                +-----------------+
                |                 |
                |       ...       |
@@ -132,10 +132,10 @@
                |       I/O       |
     0x40000000 +-----------------+
 
-The area between **0x10000000** and **0x11000000** has to be protected so that
-the kernel doesn't use it. That is done by adding ``memmap=16M$256M`` to the
-command line passed to the kernel. See the `Setup SD card`_ instructions to see
-how to do it.
+The area between **0x10000000** and **0x11000000** has to be manually protected
+so that the kernel doesn't use it. That is done by adding ``memmap=16M$256M`` to
+the command line passed to the kernel. See the `Setup SD card`_ instructions to
+see how to do it.
 
 The last 16 MiB of DRAM can only be accessed by the VideoCore, that has
 different mappings than the Arm cores in which the I/O addresses don't overlap
@@ -304,8 +304,8 @@
 .. code:: shell
 
     CROSS_COMPILE=aarch64-linux-gnu- make PLAT=rpi3             \
-    PRELOADED_BL33_BASE=0x01000000                              \
-    RPI3_PRELOADED_DTB_BASE=0x02000000                          \
+    PRELOADED_BL33_BASE=0x02000000                              \
+    RPI3_PRELOADED_DTB_BASE=0x01000000                          \
     RPI3_DIRECT_LINUX_BOOT=1
 
 For a 32-bit kernel:
@@ -313,8 +313,8 @@
 .. code:: shell
 
     CROSS_COMPILE=aarch64-linux-gnu- make PLAT=rpi3             \
-    PRELOADED_BL33_BASE=0x01000000                              \
-    RPI3_PRELOADED_DTB_BASE=0x02000000                          \
+    PRELOADED_BL33_BASE=0x02000000                              \
+    RPI3_PRELOADED_DTB_BASE=0x01000000                          \
     RPI3_DIRECT_LINUX_BOOT=1                                    \
     RPI3_BL33_IN_AARCH32=1
 
@@ -398,8 +398,8 @@
 ::
 
     enable_uart=1
-    kernel_address=0x01000000
-    device_tree_address=0x02000000
+    kernel_address=0x02000000
+    device_tree_address=0x01000000
 
 If you connect a serial cable to the Mini UART and your computer, and connect
 to it (for example, with ``screen /dev/ttyUSB0 115200``) you should see some