tc2: update run-config scripts
Updated run-config scripts to listen to proper UART for the
expected logs as well as to create a GPT image to feed it
to the model.
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Change-Id: I66dacda0334be8b9ccd57829241058285e27131c
(cherry picked from commit db92983bf80cea512e1ea72b957bda9479129b95)
diff --git a/run_config/fvp-linux.tc b/run_config/fvp-linux.tc
index d9a0af7..6415588 100644
--- a/run_config/fvp-linux.tc
+++ b/run_config/fvp-linux.tc
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -10,6 +10,9 @@
image="kernel" type="tc-kernel" get_boot_image
image="initrd" type="tc-ramdisk" get_boot_image
+ url="$tc_prebuilts/tc_fitimage.bin" saveas="tc_fitimage.bin" fetch_file
+ archive_file "tc_fitimage.bin"
+
# Use SCP binary from SCP build if it exists, or fetch pre-built ones.
if [ ! -f "$archive/scp_rom.bin" ]; then
# Pick the appropriate binary based on target platform variant
@@ -17,28 +20,32 @@
archive_file "scp_rom.bin"
fi
-
# RSS is applicable to TC2
if [ $plat_variant -eq 2 ]; then
# Hold RSS terminal_uart_ap
- uart="2" file="hold_uart.exp" track_expect
+ uart="1" port="5003" file="hold_uart.exp" track_expect
+
+ get_rss_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
+
+ # Create GPT image
+ gen_gpt_bin $archive/host_flash_fip.bin 12582912 16
fi
}
generate_lava_job_template() {
# Hold scp terminal_s0
uart="0" port="5002" file="hold_uart.exp" track_expect
- uart="1" port="5003" file="linux-rd-busybox.exp" set_primary="1" \
- track_expect
+ uart="2" port="5000" file="tc-fitimage-busybox.exp" set_primary="1" \
+ track_expect
- set_uart_port "${archive:?}" 2 5000
+ set_uart_port "${archive:?}" 1 5003
set_uart_port "${archive:?}" 3 5001
payload_type="linux" gen_yaml_template
diff --git a/run_config/fvp-tc.crash b/run_config/fvp-tc.crash
index e7317fd..d5d1374 100644
--- a/run_config/fvp-tc.crash
+++ b/run_config/fvp-tc.crash
@@ -1,11 +1,12 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
+# Copyright (c) 2023-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
generate_lava_job() {
- uart="1" timeout="60" port="5003" file="crash_passed_test.exp" set_primary="1" \
+ uart="3" timeout="60" port="5001" file="crash_passed_test.exp" set_primary="1" \
track_expect
+ uart="2" port="5000" file="hold_uart.exp" track_expect
}
diff --git a/run_config/fvp-tc.signer b/run_config/fvp-tc.signer
index fb0e1fa..c93e818 100644
--- a/run_config/fvp-tc.signer
+++ b/run_config/fvp-tc.signer
@@ -1,11 +1,12 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
+# Copyright (c) 2023-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
generate_lava_job() {
- uart="1" timeout="60" port="5003" file="signer-id.exp" set_primary="1" \
+ uart="3" timeout="60" port="5001" file="signer-id.exp" set_primary="1" \
track_expect
+ uart="2" port="5000" file="hold_uart.exp" track_expect
}
diff --git a/run_config/fvp-tc.spm.tftf b/run_config/fvp-tc.spm.tftf
index 102ca80..53cf805 100644
--- a/run_config/fvp-tc.spm.tftf
+++ b/run_config/fvp-tc.spm.tftf
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2023, Arm Limited. All rights reserved.
+# Copyright (c) 2023-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -17,27 +17,25 @@
}
fetch_tf_resource() {
- # Use SCP binary from SCP build if it exists, or fetch pre-built ones.
- if [ ! -f "$archive/scp_rom.bin" ]; then
- # Pick the appropriate binary based on target platform variant
- url="$scp_mcp_downloads/tc$plat_variant/platform_variant_0/release/tc$plat_variant-bl1.bin" saveas="scp_rom.bin" fetch_file
- archive_file "scp_rom.bin"
- fi
-
# RSS output is printed to UART 2 so track it.
- uart="2" file="hold_uart.exp" track_expect
+ uart="1" port="5003" file="hold_uart.exp" track_expect
+
+ get_rss_prov_bins
sign_image bl1.bin $ap_bl1_flash_load_addr $ap_bl1_flash_size
update_fip
+
+ # Create GPT image
+ gen_gpt_bin $archive/host_flash_fip.bin 12582912 16
}
generate_lava_job_template() {
- uart="0" port="5002" set_primary="1" file="tftf-non-primary.exp" track_expect
- uart="1" port="5003" file="spm-cactus-sp-uart1.exp" track_expect
+ uart="2" port="5000" set_primary="1" file="tftf-non-primary.exp" track_expect
+ uart="3" port="5001" file="spm-cactus-sp-uart1.exp" track_expect
- set_uart_port "${archive:?}" 2 5000
- set_uart_port "${archive:?}" 3 5001
+ set_uart_port "${archive:?}" 0 5002
+ set_uart_port "${archive:?}" 1 5003
payload_type="tftf" memory_tagging_support_level="2" gen_yaml_template
}
diff --git a/run_config/fvp-tc2 b/run_config/fvp-tc2
index d63748b..c7cdaa0 100644
--- a/run_config/fvp-tc2
+++ b/run_config/fvp-tc2
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -11,7 +11,7 @@
uart="1" set_expect_variable "num_cpus" "8"
set_run_env "ports_script" "$ci_root/model/tc-ports.awk"
- set_run_env "num_uarts" "3"
+ set_run_env "num_uarts" "4"
model="$model" gen_model_params
model="$model" gen_fvp_yaml