Update UART terminals used by TC FVP model
terminal_uart_aon is no more supported by recent TC FVP Model.
Use scp terminal_s0 instead and update the total uart count.
FASTSIM_CMN_INTERNAL_RNSAM environment variable is deprecated
in the new TC FVP model. Made necessary fix in the run fragment.
Change-Id: I14a957cb6d0f45675c1fd67b9968c410550f65fe
Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
diff --git a/model/tc0-ports.awk b/model/tc0-ports.awk
index 56ca128..dc5eb0f 100644
--- a/model/tc0-ports.awk
+++ b/model/tc0-ports.awk
@@ -6,7 +6,6 @@
/terminal_s0/ { ports[0] = $NF }
/terminal_s1/ { ports[1] = $NF }
-/terminal_uart_aon/ { ports[2] = $NF }
END {
for (i = 0; i < num_uarts; i++) {
if (ports[i] != "")
diff --git a/run_config/fvp-tc0 b/run_config/fvp-tc0
index 316edcd..093b4d1 100644
--- a/run_config/fvp-tc0
+++ b/run_config/fvp-tc0
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2020, Arm Limited. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -12,15 +12,13 @@
archive_file "scp_romfw.bin"
fi
- # Hold terminal_uart_aon
- uart="2" file="hold_uart.exp" track_expect
+ # Hold scp terminal_s0
+ uart="0" file="hold_uart.exp" track_expect
}
post_fetch_tf_resource() {
- # Needed by the Total Compute Fast Model
- set_model_env "FASTSIM_CMN_INTERNAL_RNSAM" "1"
model="tc0" gen_model_params
set_run_env "ports_script" "$ci_root/model/tc0-ports.awk"
- set_run_env "num_uarts" "3"
+ set_run_env "num_uarts" "2"
uart="1" set_expect_variable "num_cpus" "4"
}