summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler <tyler.baker@linaro.org>2014-09-26 22:16:03 (GMT)
committerTyler <tyler.baker@linaro.org>2014-09-26 22:16:03 (GMT)
commit8e70b39b7343096fee177d7c55a25919f30df194 (patch)
tree1c46a80a7a1e17f154ac73d740daf7c345883995
parent83e75afaa3d44db89b9860bab5f066f487d22e10 (diff)
parent23af711d12cee0d789da5fa67e858529108f9d14 (diff)
downloadlava-dispatcher-8e70b39b7343096fee177d7c55a25919f30df194.tar.gz
lava-dispatcher-8e70b39b7343096fee177d7c55a25919f30df194.tar.xz
Merge branch 'master' into staging
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf5
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf5
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf5
3 files changed, 12 insertions, 3 deletions
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf
index 5ce3e9b..09bc2d1 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf
@@ -130,7 +130,10 @@ possible_partitions_files =
init.rc
fstab.arm-versatileexpress
-uefi_image_filename = uefi_v2p-ca5s.bin
+vexpress_uefi_image_filename = uefi_v2p-ca5s.bin
+
+vexpress_uefi_image_files =
+ uefi_v2p-ca5s.bin
vexpress_uefi_path = SOFTWARE/A5/uefi.bin
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf
index 4144766..acdd784 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf
@@ -130,7 +130,10 @@ possible_partitions_files =
init.rc
fstab.arm-versatileexpress
-uefi_image_filename = uefi_v2p-ca9.bin
+vexpress_uefi_image_filename = uefi_v2p-ca9.bin
+
+vexpress_uefi_image_files =
+ uefi_v2p-ca9.bin
vexpress_uefi_path = SOFTWARE/A9/uefi.bin
diff --git a/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf b/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf
index 8857072..2dff7be 100644
--- a/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf
@@ -128,7 +128,10 @@ possible_partitions_files =
init.rc
fstab.arm-versatileexpress
-uefi_image_filename = uefi_v2p-ca15-tc2.bin
+vexpress_uefi_image_filename = uefi_v2p-ca15-tc2.bin
+
+vexpress_uefi_image_files =
+ uefi_v2p-ca15-tc2.bin
vexpress_uefi_path = SOFTWARE/TC2/uefi.bin