feat(hftest): adapt fvp path based on host machine
Provide appropriate FVP path depending on if running with an x86 or
aarch64 host. The aarch64 FVP can be downloaded from [1].
Similarly to the x86 public FVP, the package shall be uncompressed
in the 'fvp' directory at same level as hafnium main tree.
[1] https://developer.arm.com/downloads/-/arm-ecosystem-models
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Change-Id: I1fe82c7618db25d746d7fd019413a566691b1c86
diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index 22ca699..90ad6a7 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -30,7 +30,6 @@
from telnetlib import Telnet
MACHINE = platform.machine()
-MACHINE = "linux-" + ("x64" if MACHINE == "x86_64" else MACHINE)
HFTEST_LOG_PREFIX = "[hftest] "
HFTEST_LOG_FAILURE_PREFIX = "Failure:"
@@ -44,9 +43,12 @@
DTC_SCRIPT = os.path.join(HF_ROOT, "build", "image", "dtc.py")
FVP_BINARY = os.path.join(
os.path.dirname(HF_ROOT), "fvp", "Base_RevC_AEMvA_pkg", "models",
- "Linux64_GCC-9.3", "FVP_Base_RevC-2xAEMvA")
+ "Linux64_armv8l_GCC-9.3" if MACHINE == "aarch64" else "Linux64_GCC-9.3",
+ "FVP_Base_RevC-2xAEMvA")
HF_PREBUILTS = os.path.join(HF_ROOT, "prebuilts")
-QEMU_PREBUILTS = os.path.join(HF_PREBUILTS, MACHINE, "qemu", "qemu-system-aarch64")
+QEMU_PREBUILTS = os.path.join(HF_PREBUILTS,
+ "linux-" + ("x64" if MACHINE == "x86_64" else MACHINE),
+ "qemu", "qemu-system-aarch64")
FVP_PREBUILTS_TFA_ROOT = os.path.join(
HF_PREBUILTS, "linux-aarch64", "trusted-firmware-a", "fvp")
FVP_PREBUILT_DTS = os.path.join(