commit 3035fd386f4c51f91f6a4b98f1d8293cfa82f26c
author danh-arm <dan.handley@arm.com> Mon Jan 12 17:04:03 2015 +0000
committer danh-arm <dan.handley@arm.com> Mon Jan 12 17:04:03 2015 +0000
tree 41134392a25974f1de75f11c0e4d8fdf33878517
parent 25965c1b4290acb5dc941892eadaf9ba742524bf
parent 127d26dd701396c0381ff742ea48dcf9462b9b50

Merge pull request #232 from jcastillo-arm/jc/fix_doc_bl31

Fix reset to BL3-1 instructions in user guide, part 3

docs/user-guide.md

diff --git a/docs/user-guide.md b/docs/user-guide.md
index 1afcf3b..b33c4c0 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -817,16 +817,16 @@
     -C cluster1.NUM_CORES=4                                      \
     -C cache_state_modelled=1                                    \
     -C bp.pl011_uart0.untimed_fifos=1                            \
-    -C cluster0.cpu0.RVBAR=0x04022000                            \
-    -C cluster0.cpu1.RVBAR=0x04022000                            \
-    -C cluster0.cpu2.RVBAR=0x04022000                            \
-    -C cluster0.cpu3.RVBAR=0x04022000                            \
-    -C cluster1.cpu0.RVBAR=0x04022000                            \
-    -C cluster1.cpu1.RVBAR=0x04022000                            \
-    -C cluster1.cpu2.RVBAR=0x04022000                            \
-    -C cluster1.cpu3.RVBAR=0x04022000                            \
-    --data cluster0.cpu0="<path-to>/<bl31-binary>"@0x04022000    \
-    --data cluster0.cpu0="<path-to>/<bl32-binary>"@0x04000000    \
+    -C cluster0.cpu0.RVBAR=0x04023000                            \
+    -C cluster0.cpu1.RVBAR=0x04023000                            \
+    -C cluster0.cpu2.RVBAR=0x04023000                            \
+    -C cluster0.cpu3.RVBAR=0x04023000                            \
+    -C cluster1.cpu0.RVBAR=0x04023000                            \
+    -C cluster1.cpu1.RVBAR=0x04023000                            \
+    -C cluster1.cpu2.RVBAR=0x04023000                            \
+    -C cluster1.cpu3.RVBAR=0x04023000                            \
+    --data cluster0.cpu0="<path-to>/<bl31-binary>"@0x04023000    \
+    --data cluster0.cpu0="<path-to>/<bl32-binary>"@0x04001000    \
     --data cluster0.cpu0="<path-to>/<bl33-binary>"@0x88000000    \
     -C bp.virtioblockdevice.image_path="<path-to>/<file-system-image>"
 
@@ -844,16 +844,16 @@
     -C bp.tzc_400.diagnostics=1                                  \
     -C cache_state_modelled=1                                    \
     -C bp.pl011_uart0.untimed_fifos=1                            \
-    -C cluster0.cpu0.RVBARADDR=0x04022000                        \
-    -C cluster0.cpu1.RVBARADDR=0x04022000                        \
-    -C cluster0.cpu2.RVBARADDR=0x04022000                        \
-    -C cluster0.cpu3.RVBARADDR=0x04022000                        \
-    -C cluster1.cpu0.RVBARADDR=0x04022000                        \
-    -C cluster1.cpu1.RVBARADDR=0x04022000                        \
-    -C cluster1.cpu2.RVBARADDR=0x04022000                        \
-    -C cluster1.cpu3.RVBARADDR=0x04022000                        \
-    --data cluster0.cpu0="<path-to>/<bl31-binary>"@0x04022000    \
-    --data cluster0.cpu0="<path-to>/<bl32-binary>"@0x04000000    \
+    -C cluster0.cpu0.RVBARADDR=0x04023000                        \
+    -C cluster0.cpu1.RVBARADDR=0x04023000                        \
+    -C cluster0.cpu2.RVBARADDR=0x04023000                        \
+    -C cluster0.cpu3.RVBARADDR=0x04023000                        \
+    -C cluster1.cpu0.RVBARADDR=0x04023000                        \
+    -C cluster1.cpu1.RVBARADDR=0x04023000                        \
+    -C cluster1.cpu2.RVBARADDR=0x04023000                        \
+    -C cluster1.cpu3.RVBARADDR=0x04023000                        \
+    --data cluster0.cpu0="<path-to>/<bl31-binary>"@0x04023000    \
+    --data cluster0.cpu0="<path-to>/<bl32-binary>"@0x04001000    \
     --data cluster0.cpu0="<path-to>/<bl33-binary>"@0x88000000    \
     -C bp.virtioblockdevice.image_path="<path-to>/<file-system-image>"