aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalint Matyi <Balint.Matyi@arm.com>2020-07-06 10:42:34 +0100
committerBalint Matyi <Balint.Matyi@arm.com>2020-07-06 13:02:31 +0100
commit7a0df95e284dfc8f3ca4a3f74cdc0faed4f6a81f (patch)
tree735ea40bd28ddc9a5ecd96e539217e0d5f3f0c08
parentaacfe93b15e5a7ee51d54ef47e6dd1dfe9c65d27 (diff)
downloadtrusted-firmware-m-7a0df95e284dfc8f3ca4a3f74cdc0faed4f6a81f.tar.gz
Platform: Fix wrong binary address in NOBL2 case on Musca-B1/S1
The address of the non-secure binary on the Musca-B1 and S1 boards in case of a build without BL2 was incorrect in the documentation and the flash layout header. This patch fixes that. Signed-off-by: Balint Matyi <Balint.Matyi@arm.com> Change-Id: I8bb3aedf6e98ec4c3d62a27b1678b99194e11fea
-rw-r--r--docs/getting_started/tfm_user_guide.rst4
-rw-r--r--platform/ext/target/musca_b1/partition/flash_layout.h2
-rw-r--r--platform/ext/target/musca_s1/partition/flash_layout.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/getting_started/tfm_user_guide.rst b/docs/getting_started/tfm_user_guide.rst
index eaf33f66af..c9430bd7ab 100644
--- a/docs/getting_started/tfm_user_guide.rst
+++ b/docs/getting_started/tfm_user_guide.rst
@@ -314,11 +314,11 @@ and ``tfm_ns.bin``:
- Windows::
- srec_cat.exe install\outputs\MUSCA_B1\tfm_s.bin -Binary -offset 0xA000000 install\outputs\MUSCA_B1\tfm_ns.bin -Binary -offset 0xA060000 -o tfm.hex -Intel
+ srec_cat.exe install\outputs\MUSCA_B1\tfm_s.bin -Binary -offset 0xA000000 install\outputs\MUSCA_B1\tfm_ns.bin -Binary -offset 0xA080000 -o tfm.hex -Intel
- Linux::
- srec_cat install/outputs/MUSCA_B1/tfm_s.bin -Binary -offset 0xA000000 install/outputs/MUSCA_B1/tfm_ns.bin -Binary -offset 0xA060000 -o tfm.hex -Intel
+ srec_cat install/outputs/MUSCA_B1/tfm_s.bin -Binary -offset 0xA000000 install/outputs/MUSCA_B1/tfm_ns.bin -Binary -offset 0xA080000 -o tfm.hex -Intel
********************************************************
Execute TF-M example and regression tests on MPS3 boards
diff --git a/platform/ext/target/musca_b1/partition/flash_layout.h b/platform/ext/target/musca_b1/partition/flash_layout.h
index 0a6b3ccfe3..1ccb5e8566 100644
--- a/platform/ext/target/musca_b1/partition/flash_layout.h
+++ b/platform/ext/target/musca_b1/partition/flash_layout.h
@@ -48,7 +48,7 @@
*
* Flash layout on Musca-B1 without BL2:
* 0x0A00_0000 Secure image
- * 0x0A07_0000 Non-secure image
+ * 0x0A08_0000 Non-secure image
*
* QSPI Flash layout
* 0x0000_0000 Protected Storage Area (20 KB)
diff --git a/platform/ext/target/musca_s1/partition/flash_layout.h b/platform/ext/target/musca_s1/partition/flash_layout.h
index ea0d3b19a6..72b4810d94 100644
--- a/platform/ext/target/musca_s1/partition/flash_layout.h
+++ b/platform/ext/target/musca_s1/partition/flash_layout.h
@@ -51,7 +51,7 @@
*
* Flash layout on Musca-S1 without BL2:
* 0x0A00_0000 Secure image
- * 0x0A07_0000 Non-secure image
+ * 0x0A08_0000 Non-secure image
*/
/* This header file is included from linker scatter file as well, where only a