Platform: Update Musca-B1 and S1 upgrade strategies
The SWAP and OVERWRITE_ONLY upgrade strategies are now supported, so
note this in the documentation. Also, RAM_LOADING was never supported,
but previously, only NO_SWAP was allowed, so forbid RAM_LOADING in
CMake explicitly.
Signed-off-by: Balint Matyi <Balint.Matyi@arm.com>
Change-Id: Ifa5e4e5a453f5b2e7321646ddea78571544fd8e7
diff --git a/docs/user_guides/tfm_secure_boot.rst b/docs/user_guides/tfm_secure_boot.rst
index 8a429b2..54c84d9 100644
--- a/docs/user_guides/tfm_secure_boot.rst
+++ b/docs/user_guides/tfm_secure_boot.rst
@@ -235,9 +235,9 @@
+-------------+-----------------+---------------+----------+-------------+-----------------+
| Musca-A | No | No | No | No | Yes |
+-------------+-----------------+---------------+----------+-------------+-----------------+
-| Musca-B1 | Yes | No | No | Yes | No |
+| Musca-B1 | Yes | Yes | Yes | Yes | No |
+-------------+-----------------+---------------+----------+-------------+-----------------+
-| Musca-S1 | Yes | No | No | Yes | No |
+| Musca-S1 | Yes | Yes | Yes | Yes | No |
+-------------+-----------------+---------------+----------+-------------+-----------------+
| AN524 | Yes | No | No | Yes | No |
+-------------+-----------------+---------------+----------+-------------+-----------------+
@@ -694,8 +694,8 @@
IMAGE2ADDRESS: 0x10180000
IMAGE2FILE: \Software\tfm_sig1.bin ; TF-M regression test binary blob
-Executing firmware upgrade on Musca-B1 board
---------------------------------------------
+Executing firmware upgrade on Musca-B1 and Musca-S1 boards
+----------------------------------------------------------
After the two images have been built, they can be concatenated to create the
combined image using ``srec_cat``:
diff --git a/platform/ext/musca_b1.cmake b/platform/ext/musca_b1.cmake
index 1842d30..51401e9 100644
--- a/platform/ext/musca_b1.cmake
+++ b/platform/ext/musca_b1.cmake
@@ -37,6 +37,9 @@
if (BL2)
set(BL2_LINKER_CONFIG ${BL2_SCATTER_FILE_NAME})
+ if (${MCUBOOT_UPGRADE_STRATEGY} STREQUAL "RAM_LOADING")
+ message(FATAL_ERROR "ERROR: RAM_LOADING upgrade strategy is not supported on target '${TARGET_PLATFORM}'.")
+ endif()
#FixMe: MCUBOOT_SIGN_RSA_LEN can be removed when ROTPK won't be hard coded in platform/ext/common/template/tfm_rotpk.c
# instead independently loaded from secure code as a blob.
diff --git a/platform/ext/musca_s1.cmake b/platform/ext/musca_s1.cmake
index b3cf78d..9e73604 100644
--- a/platform/ext/musca_s1.cmake
+++ b/platform/ext/musca_s1.cmake
@@ -37,6 +37,9 @@
if (BL2)
set(BL2_LINKER_CONFIG ${BL2_SCATTER_FILE_NAME})
+ if (${MCUBOOT_UPGRADE_STRATEGY} STREQUAL "RAM_LOADING")
+ message(FATAL_ERROR "ERROR: RAM_LOADING upgrade strategy is not supported on target '${TARGET_PLATFORM}'.")
+ endif()
#FixMe: MCUBOOT_SIGN_RSA_LEN can be removed when ROTPK won't be hard coded in platform/ext/common/template/tfm_rotpk.c
# instead independently loaded from secure code as a blob.