Use DTC from prebuilts
Sibling CL I2444a8574cf41e0ca92cf92b9bd4aa3a2de8b4ec adds a prebuilt
of the Device Tree Compiler. Switch our scripts to using it instead of
the one in system.
This is necessary because:
(a) hermetic builds, and
(b) dtc in Ubuntu is outdated.
Note that we cannot remove dtc from the compilation container yet as it
is still required for compiling the Linux kernel.
Bug: 117551352
Bug: 132428451
Change-Id: I68a9c266b0212d8bbfb60c5389b28d3f6fe5e8cf
diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index 8f6dc6a..9a9019c 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -35,6 +35,8 @@
HFTEST_LOG_FAILURE_PREFIX = "Failure:"
HFTEST_LOG_FINISHED = "FINISHED"
+HF_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
+DTC_SCRIPT = os.path.join(HF_ROOT, "build", "image", "dtc.py")
def log_timeout_returncode(f, returncode):
if returncode == 0:
@@ -46,7 +48,6 @@
f.write("\r\n{}{} process return code {}\r\n".format(
HFTEST_LOG_PREFIX, HFTEST_LOG_FAILURE_PREFIX, returncode))
-
def qemu(image, initrd, args, log):
qemu_args = [
"timeout", "--foreground", "10s",
@@ -75,10 +76,7 @@
uart0_log = log + ".uart0"
uart1_log = log + ".uart1"
fdt = log + ".dtb"
- dtc_args = [
- "dtc", "-I", "dts", "-O", "dtb",
- "-o", fdt,
- ]
+ dtc_args = [ DTC_SCRIPT, "-o", fdt ]
fvp_args = [
"timeout", "--foreground", "40s",
"../fvp/Base_RevC_AEMv8A_pkg/models/Linux64_GCC-4.9/FVP_Base_RevC-2xAEMv8A",