fix(fvp): remove R-class FVP models
Support for the fvp-r platform was removed in 74a3fb7c, we don't need
the run and model configs.
Signed-off-by: Boyan Karatotev <boyan.karatotev@arm.com>
Change-Id: I5602a7cb000bb254aac631da2268e787becbf1fb
diff --git a/fvp_utils.sh b/fvp_utils.sh
index d1b8296..c860a9d 100644
--- a/fvp_utils.sh
+++ b/fvp_utils.sh
@@ -57,7 +57,6 @@
# FVP containers and model paths
fvp_arm_std_library="fvp:fvp_arm_std_library_${model_version}_${model_build};/opt/model/FVP_ARM_Std_Library/FVP_Base"
fvp_base_revc_2xaemva="fvp:fvp_base_revc-2xaemva_${model_version}_${model_build}_linux64;/opt/model/Base_RevC_AEMvA_pkg/models/${model_flavour}"
-fvp_base_aemv8r="fvp:fvp_base_aemv8r_${model_version}_${model_build};/opt/model/AEMv8R_base_pkg/models/${model_flavour}"
fvp_rd_1_ae="fvp:fvp_rd_1_ae_${model_version}_${model_build};/opt/model/FVP_RD_1_AE/models/${model_flavour}"
# CSS model list
@@ -101,7 +100,6 @@
[neoverse_n2]="${fvp_arm_std_library};FVP_Base_Neoverse-N2"
[neoverse-v1x4]="${fvp_arm_std_library};FVP_Base_Neoverse-V1"
[tc4]="${fvp_tc4};FVP_TC4"
-[baser-aemv8r]="${fvp_base_aemv8r};FVP_BaseR_AEMv8R"
[rd1ae]="${fvp_rd_1_ae};FVP_RD_1_AE"
)
diff --git a/model/baser-aemv8r.sh b/model/baser-aemv8r.sh
deleted file mode 100644
index 5eee3a7..0000000
--- a/model/baser-aemv8r.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-if is_arm_jenkins_env || upon "$local_ci"; then
- # Internal ARM Jenkins environment path
- set_model_path "$warehouse/SysGen/Models/$model_version/$model_build/external/models/$model_flavour/FVP_BaseR_AEMv8R"
-else
- # OpenCI support will be added in a future patch
- source "$ci_root/fvp_utils.sh"
- # fvp_models variable contains the information for FVP paths, where 2nd field
- # points to the /opt/model/*/models/${model_flavour}
- models_dir="$(echo ${fvp_models[$model]} | awk -F ';' '{print $2}')"
- set_model_path "$models_dir"
-fi
-
-# Write model command line options
-cat <<EOF >"$model_param_file"
--C bp.terminal_0.start_port=5000
--C bp.terminal_1.start_port=5001
--C bp.terminal_2.start_port=5002
--C bp.terminal_3.start_port=5003
-
--C bp.pl011_uart0.unbuffered_output=1
--C bp.pl011_uart0.untimed_fifos=true
--C cache_state_modelled=0
--C bp.vis.rate_limit-enable=0
--C cluster0.NUM_CORES=4
--C cluster0.has_aarch64=1
--C bp.exclusive_monitor.monitor_access_level=1
--C cluster0.cpu0.RVBAR=0x80000000
--C cluster0.cpu1.RVBAR=0x80000000
--C cluster0.cpu2.RVBAR=0x80000000
--C cluster0.cpu3.RVBAR=0x80000000
--C bp.dram_metadata.init_value=0
--C bp.dram_metadata.is_enabled=true
--C bp.dram_size=8
--C bp.refcounter.non_arch_start_at_default=1
--C bp.ve_sysregs.mmbSiteDefault=0
--C cluster0.gicv3.cpuintf-mmap-access-level=2
--C cluster0.gicv3.SRE-enable-action-on-mmap=2
--C cluster0.gicv3.SRE-EL2-enable-RAO=1
--C cluster0.gicv3.extended-interrupt-range-support=1
--C cluster0.stage12_tlb_size=512
--C gic_distributor.GICD_CTLR-DS-1-means-secure-only=1
--C gic_distributor.GITS_BASER0-type=1
--C gic_distributor.ITS-count=1
--C gic_distributor.ITS-hardware-collection-count=1
--C gic_distributor.direct-lpi-support=1
--C gic_distributor.has-two-security-states=0
--C pctl.startup=0.0.0.*
--C bp.secureflashloader.fname=$bl1_bin
--C bp.virtioblockdevice.image_path=$rootfs_bin
---data cluster0.cpu0=$fip_bin@$fip_addr
---data cluster0.cpu0=$dtb_bin@$dtb_addr
---data cluster0.cpu0=$kernel_bin@$kernel_addr
-
-EOF
diff --git a/run_config/fvp-aemv8r.linux b/run_config/fvp-aemv8r.linux
deleted file mode 100755
index 74598c0..0000000
--- a/run_config/fvp-aemv8r.linux
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2021-2023, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-post_tf_build() {
- # Download and archive FVP-R files
- url="$tfa_downloads/fvp_r_2023/core-image-minimal-fvp-baser-aemv8r64.wic" saveas="rootfs.bin" fetch_file
- url="$tfa_downloads/fvp_r_2023/fvp-baser-aemv8r64.dtb" saveas="dtb.bin" fetch_file
- url="$tfa_downloads/fvp_r_2023/Image" saveas="kernel.bin" fetch_file
- url="$tfa_downloads/fvp_r_2023/u-boot.bin" saveas="uboot.bin" fetch_file
-
- archive_file "rootfs.bin"
- archive_file "dtb.bin"
- archive_file "kernel.bin"
- archive_file "uboot.bin"
-
- # Build FIP image with Uboot as BL33
- build_fip BL33="$archive/uboot.bin"
-}
-
-generate_lava_job_template() {
- payload_type="linux" gen_yaml_template
-}
-
-generate_lava_job() {
- local model="baser-aemv8r"
-
- uart="0" set_expect_variable "num_cpus" "1"
- uart="0" file="fvp-r-yocto.exp" track_expect
-
- model="$model" \
- dtb_addr="0x0fc00000" \
- fip_addr="0x40000000" \
- kernel_addr="0x00800000" \
- gen_model_params
-
- model="$model" gen_fvp_yaml
-}