refactor: change all occurrences of RSS to RSE
The Runtime Security Subsytem (RSS) was renamed to Runtime Security
Engine (RSE). Change all occurrences of "RSS"/"rss" in the code and file
names to "RSE"/"rse".
The related changes in TF-A can be found under the "rss_rse_rename"
topic: https://review.trustedfirmware.org/q/topic:%22rss_rse_rename%22
Change-Id: Icd72ff3ed2d63e87d84baadfab02ccf75a545d08
Signed-off-by: David Vincze <david.vincze@arm.com>
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index 048a9fe..188110e 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -4,7 +4,7 @@
#
# SPDX-License-Identifier: BSD-3-Clause
#
-source "$ci_root/run_config/tc_rss_utils.sh"
+source "$ci_root/run_config/tc_rse_utils.sh"
fetch_tf_resource() {
image="kernel" type="tc-kernel" get_boot_image
@@ -20,18 +20,18 @@
archive_file "scp_rom.bin"
fi
- # RSS is applicable to TC2
+ # RSE is applicable to TC2
if [ $plat_variant -eq 2 ]; then
- # Hold RSS terminal_uart_ap
+ # Hold RSE terminal_uart_ap
uart="1" port="5003" file="hold_uart.exp" track_expect
- get_rss_prov_bins
+ get_rse_prov_bins
# sign AP bl1
sign_image bl1.bin $ap_bl1_flash_load_addr $ap_bl1_flash_size
- # Update FIP with pre-built RSS binaries and signed AP BL1 to create host flash fip image
+ # Update FIP with pre-built RSE binaries and signed AP BL1 to create host flash fip image
update_fip
# Create GPT image
diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index 09bdb30..552a52e 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -5,7 +5,7 @@
# SPDX-License-Identifier: BSD-3-Clause
#
-source "$ci_root/run_config/tc_rss_utils.sh"
+source "$ci_root/run_config/tc_rse_utils.sh"
post_tf_build() {
if [ ! -f "$archive/scp_ram.bin" ]; then
@@ -17,10 +17,10 @@
}
fetch_tf_resource() {
- # RSS output is printed to UART 2 so track it.
+ # RSE output is printed to UART 2 so track it.
uart="1" port="5003" file="hold_uart.exp" track_expect
- get_rss_prov_bins
+ get_rse_prov_bins
sign_image bl1.bin $ap_bl1_flash_load_addr $ap_bl1_flash_size
diff --git a/run_config/tc_rse_utils.sh b/run_config/tc_rse_utils.sh
new file mode 100644
index 0000000..7606e7b
--- /dev/null
+++ b/run_config/tc_rse_utils.sh
@@ -0,0 +1,107 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2023-2024, Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+sign_image() {
+ # $1 ... host binary name to sign
+ # $2 ... image load address
+ # $3 ... signed bin size
+
+ local tmpdir="$(mktempdir)"
+ host_bin="`basename ${1}`"
+ signed_bin="signed_`basename ${1}`"
+ host_binary_layout="`basename -s .bin ${1}`_ns"
+
+ # development PEM containing a key - use same key which is used for SCP BL1 in pre-built image
+ url="$tc_prebuilts/tc$plat_variant/root-RSA-3072.pem" saveas="root-RSA-3072.pem" fetch_file
+ archive_file "root-RSA-3072.pem"
+
+ RSE_SIGN_PRIVATE_KEY=$archive/root-RSA-3072.pem
+ RSE_SEC_CNTR_INIT_VAL=1
+ RSE_LAYOUT_WRAPPER_VERSION="1.5.0"
+
+ cat << EOF > $tmpdir/$host_binary_layout
+enum image_attributes {
+ RE_IMAGE_LOAD_ADDRESS = $2,
+ RE_SIGN_BIN_SIZE = $3,
+};
+EOF
+
+ if [ ! -f $archive/$host_bin ]; then
+ echo "$archive/$host_bin does not exist. Aborting...!"
+ exit 1
+ fi
+
+ echo "Signing `basename ${1}`"
+ # Get mcuboot
+ git clone "https://github.com/mcu-tools/mcuboot.git" $tmpdir/mcuboot
+ # Fetch wrapper script
+ saveas="$tmpdir" url="$tc_prebuilts/tc$plat_variant/wrapper_scripts" fetch_directory
+
+ echo "Installing dependencies..."
+ pip3 install cryptography cbor2 intelhex pyyaml
+
+ pushd $tmpdir/mcuboot/scripts
+ python3 $tmpdir/wrapper_scripts/wrapper/wrapper.py \
+ -v $RSE_LAYOUT_WRAPPER_VERSION \
+ --layout $tmpdir/$host_binary_layout \
+ -k $RSE_SIGN_PRIVATE_KEY \
+ --public-key-format full \
+ --align 1 \
+ --pad \
+ --pad-header \
+ -H 0x2000 \
+ -s $RSE_SEC_CNTR_INIT_VAL \
+ $archive/$host_bin \
+ $tmpdir/$signed_bin
+
+ echo "created signed_`basename ${1}`"
+ url="$tmpdir/$signed_bin" saveas="$signed_bin" fetch_file
+ archive_file "$signed_bin"
+ popd
+}
+
+update_fip() {
+ local prebuild_prefix=$tc_prebuilts/tc$plat_variant/$rse_revision
+
+ # Get pre-built rse rom
+ url="$prebuild_prefix/rse_rom.bin" fetch_file
+ archive_file "rse_rom.bin"
+
+ # Get pre-built rse bl2 signed bin
+ url="$prebuild_prefix/rse_bl2_signed.bin" fetch_file
+ archive_file "rse_bl2_signed.bin"
+
+ # Get pre-built rse TF-M S signed bin
+ url="$prebuild_prefix/rse_s_signed.bin" fetch_file
+ archive_file "rse_s_signed.bin"
+
+ # Get pre-built SCP signed bin
+ url="$prebuild_prefix/signed_scp_romfw.bin" fetch_file
+ archive_file "signed_scp_romfw.bin"
+
+ # Create FIP layout
+ "$fiptool" update \
+ --align 8192 --rse-bl2 "$archive/rse_bl2_signed.bin" \
+ --align 8192 --rse-s "$archive/rse_s_signed.bin" \
+ --align 8192 --rse-scp-bl1 "$archive/signed_scp_romfw.bin" \
+ --align 8192 --rse-ap-bl1 "$archive/$signed_bin" \
+ --out "host_flash_fip.bin" \
+ "$archive/fip.bin"
+ archive_file "host_flash_fip.bin"
+}
+
+get_rse_prov_bins() {
+ local prebuild_prefix=$tc_prebuilts/tc$plat_variant/$rse_revision
+
+ # Get pre-built rse rse_encrypted_cm_provisioning_bundle_0 bin
+ url="$prebuild_prefix/rse_encrypted_cm_provisioning_bundle_0.bin" fetch_file
+ archive_file "rse_encrypted_cm_provisioning_bundle_0.bin"
+
+ # Get pre-built rse rse_encrypted_dm_provisioning_bundle bin
+ url="$prebuild_prefix/rse_encrypted_dm_provisioning_bundle.bin" fetch_file
+ archive_file "rse_encrypted_dm_provisioning_bundle.bin"
+}
diff --git a/run_config/tc_rss_utils.sh b/run_config/tc_rss_utils.sh
deleted file mode 100644
index 1cafe08..0000000
--- a/run_config/tc_rss_utils.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2023-2024, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-sign_image() {
- # $1 ... host binary name to sign
- # $2 ... image load address
- # $3 ... signed bin size
-
- local tmpdir="$(mktempdir)"
- host_bin="`basename ${1}`"
- signed_bin="signed_`basename ${1}`"
- host_binary_layout="`basename -s .bin ${1}`_ns"
-
- # development PEM containing a key - use same key which is used for SCP BL1 in pre-built image
- url="$tc_prebuilts/tc$plat_variant/root-RSA-3072.pem" saveas="root-RSA-3072.pem" fetch_file
- archive_file "root-RSA-3072.pem"
-
- RSS_SIGN_PRIVATE_KEY=$archive/root-RSA-3072.pem
- RSS_SEC_CNTR_INIT_VAL=1
- RSS_LAYOUT_WRAPPER_VERSION="1.5.0"
-
- cat << EOF > $tmpdir/$host_binary_layout
-enum image_attributes {
- RE_IMAGE_LOAD_ADDRESS = $2,
- RE_SIGN_BIN_SIZE = $3,
-};
-EOF
-
- if [ ! -f $archive/$host_bin ]; then
- echo "$archive/$host_bin does not exist. Aborting...!"
- exit 1
- fi
-
- echo "Signing `basename ${1}`"
- # Get mcuboot
- git clone "https://github.com/mcu-tools/mcuboot.git" $tmpdir/mcuboot
- # Fetch wrapper script
- saveas="$tmpdir" url="$tc_prebuilts/tc$plat_variant/wrapper_scripts" fetch_directory
-
- echo "Installing dependencies..."
- pip3 install cryptography cbor2 intelhex pyyaml
-
- pushd $tmpdir/mcuboot/scripts
- python3 $tmpdir/wrapper_scripts/wrapper/wrapper.py \
- -v $RSS_LAYOUT_WRAPPER_VERSION \
- --layout $tmpdir/$host_binary_layout \
- -k $RSS_SIGN_PRIVATE_KEY \
- --public-key-format full \
- --align 1 \
- --pad \
- --pad-header \
- -H 0x2000 \
- -s $RSS_SEC_CNTR_INIT_VAL \
- $archive/$host_bin \
- $tmpdir/$signed_bin
-
- echo "created signed_`basename ${1}`"
- url="$tmpdir/$signed_bin" saveas="$signed_bin" fetch_file
- archive_file "$signed_bin"
- popd
-}
-
-update_fip() {
- local prebuild_prefix=$tc_prebuilts/tc$plat_variant/$rss_revision
-
- # Get pre-built rss rom
- url="$prebuild_prefix/rss_rom.bin" fetch_file
- archive_file "rss_rom.bin"
-
- # Get pre-built rss bl2 signed bin
- url="$prebuild_prefix/rss_bl2_signed.bin" fetch_file
- archive_file "rss_bl2_signed.bin"
-
- # Get pre-built rss TF-M S signed bin
- url="$prebuild_prefix/rss_s_signed.bin" fetch_file
- archive_file "rss_s_signed.bin"
-
- # Get pre-built SCP signed bin
- url="$prebuild_prefix/signed_scp_romfw.bin" fetch_file
- archive_file "signed_scp_romfw.bin"
-
- # Create FIP layout
- "$fiptool" update \
- --align 8192 --rss-bl2 "$archive/rss_bl2_signed.bin" \
- --align 8192 --rss-s "$archive/rss_s_signed.bin" \
- --align 8192 --rss-scp-bl1 "$archive/signed_scp_romfw.bin" \
- --align 8192 --rss-ap-bl1 "$archive/$signed_bin" \
- --out "host_flash_fip.bin" \
- "$archive/fip.bin"
- archive_file "host_flash_fip.bin"
-}
-
-get_rss_prov_bins() {
- local prebuild_prefix=$tc_prebuilts/tc$plat_variant/$rss_revision
-
- # Get pre-built rss rss_encrypted_cm_provisioning_bundle_0 bin
- url="$prebuild_prefix/rss_encrypted_cm_provisioning_bundle_0.bin" fetch_file
- archive_file "rss_encrypted_cm_provisioning_bundle_0.bin"
-
- # Get pre-built rss rss_encrypted_dm_provisioning_bundle bin
- url="$prebuild_prefix/rss_encrypted_dm_provisioning_bundle.bin" fetch_file
- archive_file "rss_encrypted_dm_provisioning_bundle.bin"
-}