commit a081a298593b1527af9c41f8a3e5a78a423bff88
author Andrew Walbran <qwandor@google.com> Thu Jan 23 10:08:42 2020 +0000
committer Andrew Walbran <qwandor@google.com> Wed Sep 16 13:50:21 2020 +0100
tree eeeecd2c2ab69e6f45bd72bf97d620d5d67f190e
parent 2a8ee3447bc2601154618c26376caf8784b9efbc

Run QEMU tests with Trusty SPD.

Bug: 132429380
Change-Id: I131f938c4ff4a0f7fbc19ccf4c539d580418c28b

prebuilts

diff --git a/prebuilts b/prebuilts
index ce0ff4e..813c843 160000
--- a/prebuilts
+++ b/prebuilts
@@ -1 +1 @@
-Subproject commit ce0ff4e3bb78d04d52f4717233706431055d0710
+Subproject commit 813c843f401464e7cab67b7555014c71969a49e7

src/arch/aarch64/qemuloader/BUILD.gn

diff --git a/src/arch/aarch64/qemuloader/BUILD.gn b/src/arch/aarch64/qemuloader/BUILD.gn
index f676709..699faa6 100644
--- a/src/arch/aarch64/qemuloader/BUILD.gn
+++ b/src/arch/aarch64/qemuloader/BUILD.gn
@@ -40,6 +40,7 @@
   sources = [
     "//prebuilts/linux-aarch64/arm-trusted-firmware/qemu/bl2.bin",
     "//prebuilts/linux-aarch64/arm-trusted-firmware/qemu/bl31.bin",
+    "//prebuilts/linux-aarch64/arm-trusted-firmware/qemu/bl32.bin",
   ]
   outputs = [
     "$root_out_dir/{{source_file_part}}",

test/hftest/hftest.py

diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index c2de3a5..06fb719 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -199,7 +199,7 @@
         exec_args = [
             "timeout", "--foreground", time_limit,
             os.path.abspath("prebuilts/linux-x64/qemu/qemu-system-aarch64"),
-            "-machine", "virt,virtualization=on,gic_version=3",
+            "-machine", "virt,virtualization=on,gic-version=3",
             "-cpu", cpu, "-smp", "4", "-m", "1G",
             "-nographic", "-nodefaults", "-serial", "stdio",
             "-d", "unimp", "-kernel", os.path.abspath(self.args.kernel),