2018.5 LKFT template changes

Change-Id: If28e2eca2ccea8edb5538c90d49f322c21bf0d96
Reviewed-on: https://review.linaro.org/25479
Reviewed-by: lava-bot
Reviewed-by: Dave Pigott <dave.pigott@linaro.org>

20 files changed, 215 insertions, 9 deletions

diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/apq8016-sbc-uboot.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/apq8016-sbc-uboot.jinja2
index 839f669c0..e81699808 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/apq8016-sbc-uboot.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/apq8016-sbc-uboot.jinja2
@@ -11,8 +11,9 @@
 {% set bootloader_prompt = bootloader_prompt|default('=>') %}
 {% set action_timeout_u_boot_commands = 90 %}
 {% set booti_kernel_addr = '0x80080000' %}
-{% set booti_ramdisk_addr = '0x82000000' %}
-{% set booti_dtb_addr = '0x81e00000' %}
+{% set booti_kernel_addr = booti_kernel_addr|default('0x80080000') %}
+{% set booti_ramdisk_addr = booti_ramdisk_addr|default('0x82e00000') %}
+{% set booti_dtb_addr = booti_dtb_addr|default('0x82000000') %}
 {% set bootm_kernel_addr = booti_kernel_addr %}
 {% set bootm_ramdisk_addr = booti_ramdisk_addr %}
 {% set bootm_dtb_addr = booti_dtb_addr %}
@@ -21,3 +22,4 @@
 {% set uboot_needs_usb = true %}
 {% set uboot_mkimage_arch = 'arm64' %}
 {% set uboot_needs_interrupt = False %}
+{% set base_high_limits = False %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-fastboot.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-fastboot.jinja2
index 98fe99e29..f4c71154f 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-fastboot.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-fastboot.jinja2
@@ -28,6 +28,17 @@ actions:
         port: {{ ssh_port|default(22) }}
         user: {{ ssh_user|default('root') }}
         identity_file: {{ ssh_identity_file }}
+{% if recovery_mode %}
+{{ recovery_mode }}
+          recovery_mode:
+{% for url in recovery_mode_command %}
+          - {{ url }}
+{% endfor %}
+          recovery_exit:
+{% for url in recovery_exit_command %}
+          - {{ url }}
+{% endfor %}
+{% endif %}
       fastboot:
 {{- fastboot_deploy_uboot }}
 {{- fastboot_interrupt_params }}
@@ -38,6 +49,7 @@ actions:
     connections:
       lxc:
       serial:
+      adb:
     methods:
       lxc:
       ssh:
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-grub.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-grub.jinja2
new file mode 100644
index 000000000..d1d07cd86
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-grub.jinja2
@@ -0,0 +1,112 @@
+{% extends 'base.jinja2' %}
+
+{% set console_device = console_device | default('ttyS0') %}
+{% set baud_rate = baud_rate | default(115200) %}
+{% set grub_installed_device = grub_installed_device | default('(hd1,gpt1)') %}
+{% set efi_grub = efi_grub | default(False) %}
+
+{# allow job context override - use a different variable name, undefined if not in job context #}
+{% set base_kernel_args = extra_kernel_args | default(base_kernel_args) %}
+
+{% if efi_grub %}
+
+{% if static_ip %}
+{% set net_commands = "          - net_add_addr lava efinet0 " + static_ip + "
+          - net_add_route lava 0.0.0.0 gw " + static_gateway + "
+          - net_add_dns " + static_dns %}
+{% else %}
+
+{% set net_commands = "          - net_ls_addr" %}
+
+{# end static_ip #}
+{% endif %}
+
+{% if efinet %}
+
+{% set net_commands = "          - insmod efinet
+" + net_commands %}
+
+{% endif %}
+
+{% else %}
+{# not efi_grub #}
+
+{% set net_commands = "          - net_bootp" %}
+
+{% endif %}
+
+{% if console_device %}
+{% set console_args = "console=" ~ console_device ~ "," ~ baud_rate %}
+{% else %}
+{% set console_args = "" %}
+{% endif %}
+{% if has_dtb %}
+{% set dtb_commands = "          - clear
+          - devicetree (tftp,{SERVER_IP})/{DTB}" %}
+{% else %}
+{% set dtb_commands = "" %}
+{% endif %}
+
+
+{% block body %}
+
+actions:
+  deploy:
+    connections:
+      serial:
+    methods:
+      tftp:
+  boot:
+    connections:
+      serial:
+    methods:
+      grub:
+        parameters:
+          bootloader_prompt: {{ bootloader_prompt|default('grub>') }}
+        ramdisk:
+          commands:
+{{ net_commands }}
+          - clear
+          - insmod linux
+          - clear
+          - insmod tftp
+          - clear
+          - 'linux (tftp,{SERVER_IP})/{KERNEL} {{ console_args }} {{ base_ip_args }} {{ base_kernel_args }}' 
+          - clear
+          - initrd (tftp,{SERVER_IP})/{RAMDISK}
+{{ dtb_commands }}
+          - clear
+          - boot
+        nfs:
+          commands:
+{{ net_commands }}
+          - 'linux (tftp,{SERVER_IP})/{KERNEL} {{ console_args }} root=/dev/nfs rw {{ base_nfsroot_args }} {{ base_ip_args }} {{ base_kernel_args }}'
+          - initrd (tftp,{SERVER_IP})/{RAMDISK}
+{{ dtb_commands }}
+          - boot
+        debian-installer:
+          expect_shell: False
+          commands:
+{{ net_commands }}
+          - 'linux (tftp,{SERVER_IP})/{KERNEL} auto=true interface=eth0 priority=critical noshell BOOT_DEBUG=1 DEBIAN_FRONTEND=text url=tftp://{SERVER_IP}/{PRESEED_CONFIG} --- {{ console_args }} {{ base_kernel_args }} debug verbose'
+          - initrd (tftp,{SERVER_IP})/{RAMDISK}
+{{ dtb_commands }}
+          - boot
+        debian-installed:
+          commands:
+          - insmod part_gpt
+          - insmod ext2
+          - insmod part_msdos
+          - insmod chain
+          - ls
+          - ls {{ grub_installed_device }}
+          - sleep 10
+          - set
+          - set root={{ grub_installed_device }}
+          - sleep 10
+          - ls {{ grub_installed_device }}
+          - sleep 10
+          - chainloader {{ grub_installed_device }}/efi/debian/grubaa64.efi
+          - sleep 10
+          - boot
+{% endblock %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-uboot.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-uboot.jinja2
index 19a72b3ac..c6367a587 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-uboot.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base-uboot.jinja2
@@ -128,6 +128,7 @@ actions:
 {% endif %}
       lxc:
       overlay:
+      usb:
       tftp:
       nbd:
       ssh:
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base.jinja2
index 13b053080..dc8edc995 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/base.jinja2
@@ -4,7 +4,13 @@
 
 {% set base_nfsroot_args = ("nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr" + base_extra_nfsroot_args) -%}
 {% set base_nbdroot_args = ("nbd.server={NBDSERVERIP} nbd.port={NBDSERVERPORT} root=/dev/ram0 ramdisk_size=16384 rootdelay=7 ") -%}
+
+{% if static_ip and static_gateway and static_netmask and static_dns %}
+{% set base_ip_args = base_ip_args|default("ip=" + static_ip + "::" + static_gateway + ":" + static_netmask + ":::off:" + static_dns + ":") %}
+{% else %}
 {% set base_ip_args = base_ip_args|default("ip=dhcp") %}
+{% endif %}
+
 {# these options are used by both ssh and scp! #}
 {# check the manpages *carefully* & ensure compatibility! #}
 {# Do not specify port or login (-p/-P or -l) here as this is now handled in the codebase. #}
@@ -21,10 +27,10 @@
 {% set ssh_user = 'root' -%}
 
 {# The code will create the correct port arguments for SCP and SSH, as they are different #}
-{% set ssh_port = '22' -%}
+{% set ssh_port = ssh_port|default('22') -%}
 
 {# This is no longer a requirement, to support devices that allow login without authentication #}
-{% set ssh_identity_file = 'dynamic_vm_keys/lava' -%}
+{% set ssh_identity_file = ssh_identity_file|default('dynamic_vm_keys/lava') -%}
 
 {% set schroot_options = (
 "          - 'schroot'
@@ -50,6 +56,7 @@
 
 {% block character_delays %}
 {% if boot_character_delay or test_character_delay %}
+# in milliseconds
 character_delays:
 {% if boot_character_delay %}
       boot: {{ boot_character_delay }}
@@ -77,12 +84,12 @@ constants:
       - '{{ uboot_extra_error_message }}'
 {% endif %}
   grub:
-    interrupt-prompt: '{{ grub_autoboot_prompt | default("Press enter to boot the selected OS") }}'
+    interrupt-prompt: '{{ grub_autoboot_prompt | default("for a command-line") }}'
     interrupt-character: '{{ grub_interrupt_character | default ("c") }}'
     error-messages:
       - "error: missing (.*) symbol."
   grub-efi:
-    interrupt-prompt: '{{ grub_autoboot_prompt | default("Press enter to boot the selected OS") }}'
+    interrupt-prompt: '{{ grub_autoboot_prompt | default("for a command-line") }}'
     interrupt-character: '{{ grub_interrupt_character | default ("c") }}'
     error-messages:
       - 'Undefined OpCode Exception PC at'
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/hi6220-hikey-bl.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/hi6220-hikey-bl.jinja2
new file mode 100644
index 000000000..ddc363462
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/hi6220-hikey-bl.jinja2
@@ -0,0 +1,29 @@
+{% extends 'base-fastboot.jinja2' %}
+{% set boot_character_delay = 10 %}
+{% set root_device = root_device | default('/dev/mmcblk0p9') %}
+{% set base_kernel_args = base_kernel_args|default('') %}
+{% set console_device = console_device|default('ttyAMA3') %}
+{% set baud_rate = baud_rate|default('115200') %}
+{% set fastboot_sequence = ['boot'] %}
+{% set recovery_mode_command = recovery_mode_command|default('') %}
+{% set fastboot_only_command = fastboot_only_command|default('') %}
+{# set device_type = "hi6220-hikey-bl - based on r2 based on 960" #}
+{% set fastboot_interrupt_params = "
+        interrupt_prompt: 'Android Fastboot mode'
+        interrupt_string: ' '"%}
+{% set flash_cmds_order = ['ptable', 'xloader', 'fastboot', 'nvme', 'fw_lpm3',
+'trustfirmware', 'boot', 'dts', 'system', 'userdata', 'cache'] %}
+{% set fastboot_boot_grub = "
+      grub:
+        reset_device: False
+        sequence:
+        - wait-fastboot-interrupt
+        installed:
+          commands:
+            - boot
+"%}
+{# Different device-types will have different types and numbers of commands. #}
+{% set recovery_mode = "
+      recovery:
+        commands:
+"%}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/jetson-tk1.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/jetson-tk1.jinja2
index 8ec291d2d..218d8b927 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/jetson-tk1.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/jetson-tk1.jinja2
@@ -1,6 +1,7 @@
 # Tegra 124 Jetson TK1
 {% extends 'tegra124-common.jinja2' %}
 
+{% set extra_nfsroot_args = ",vers=3" %}
 {% set device_type = "jetson-tk1" %}
 {% set bootloader_prompt = bootloader_prompt|default('Jetson TK1') %}
 
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/meson-gxbb-nanopi-k2.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/meson-gxbb-nanopi-k2.jinja2
new file mode 100644
index 000000000..6a9c7f3db
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/meson-gxbb-nanopi-k2.jinja2
@@ -0,0 +1,3 @@
+{% extends 'meson-gx-common.jinja2' %}
+
+{% set device_type = "meson-gxbb-nanopi-k2" %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/meson-gxl-s905x-libretech-cc.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/meson-gxl-s905x-libretech-cc.jinja2
new file mode 100644
index 000000000..54c090e4d
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/meson-gxl-s905x-libretech-cc.jinja2
@@ -0,0 +1,3 @@
+{% extends 'meson-gx-common.jinja2' %}
+
+{% set device_type = "meson-gxl-s905x-libretech-cc" %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/moonshot-m400.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/moonshot-m400.jinja2
new file mode 100644
index 000000000..2994cc2b6
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/moonshot-m400.jinja2
@@ -0,0 +1,6 @@
+{% extends 'base-grub.jinja2' %}
+{% set boot_character_delay = 100 %}
+{% set efi_grub = True %}
+{% set console_device = "ttyS0" %}
+{% set baud_rate = 9600 %}
+{% set has_dtb = True %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/qemu.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/qemu.jinja2
index ef7dd05bd..aeb10853b 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/qemu.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/qemu.jinja2
@@ -36,6 +36,7 @@ actions:
 {% block qemu_method %}
         parameters:
           command:
+{# start arch command #}
 {% if arch == 'arm64' or arch == 'aarch64' %}
             qemu-system-aarch64
 {% elif arch == 'arm' %}
@@ -45,8 +46,10 @@ actions:
 {% elif arch == 'i386' %}
             qemu-system-i386
 {% endif %}
+{# end arch command #}
           # used by installers to relate to the empty target device
           boot_options:
+{# start arch root #}
 {% if arch == 'arm64' or arch == 'aarch64' %}
             {root: '{{ boot_root|default("/dev/vda2") }} rw rootwait', console: {{ boot_console|default('ttyAMA0 115200') }}, ip: dhcp, mem: 1024M}
 {% elif arch == 'arm' %}
@@ -57,23 +60,32 @@ actions:
 {% else %}
             {root: {{ boot_root|default('/dev/sda1') }}, console: {{ boot_console|default('ttyS0,115200') }}}
 {% endif %}
+{# end arch root #}
           options:
 {% block qemu_options %}
+{# arch cpu #}
 {% if arch == 'arm64' or arch == 'aarch64' or arch == 'arm' %}
           - -cpu {{ cpu|default('cortex-a57') }}
           - -machine {{ machine|default('virt') }}
+{# arch cpu + vga #}
 {% if vga %}
           - {{ vga }}
 {% endif %}
+{# arch cpu #}
+{# arch cpu + serial #}
 {% if serial %}
           - {{ serial }}
 {% endif %}
+{# arch cpu #}
 {% else %}
+{# not arch cpu #}
 {% if not no_kvm %}
           - -cpu host
           - -enable-kvm
 {% endif %}
+{# end no_kvm #}
 {% endif %}
+{# end arch cpu #}
           - -nographic
           - -net nic,{{ model|default('model=virtio') }},macaddr={{ mac_addr|default('52:54:00:12:34:58') }} -net {{ netdevice|default('user') }}
           - -m {{ memory|default(512) }}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/ssh.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/ssh.jinja2
index 12fe42f81..4414fbddf 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/ssh.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/ssh.jinja2
@@ -11,7 +11,7 @@ actions:
         # secondary connections get this from the lava-multinode protocol support.
         host: '{{ ssh_host|default('') }}'
         port: {{ ssh_port|default(22) }}
-{{ ssh_identity}}
+        identity_file: {{ ssh_identity_file }}
 
   boot:
     connections:
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/synquacer-acpi.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/synquacer-acpi.jinja2
new file mode 100644
index 000000000..46e86d807
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/synquacer-acpi.jinja2
@@ -0,0 +1 @@
+{% extends 'synquacer.jinja2' %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/synquacer-dtb.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/synquacer-dtb.jinja2
new file mode 100644
index 000000000..46e86d807
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/synquacer-dtb.jinja2
@@ -0,0 +1 @@
+{% extends 'synquacer.jinja2' %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/synquacer.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/synquacer.jinja2
new file mode 100644
index 000000000..0b5f130c2
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/synquacer.jinja2
@@ -0,0 +1,6 @@
+{% extends 'base-grub.jinja2' %}
+{% set efinet = True %}
+{% set efi_grub = True %}
+{% set boot_character_delay = 100 %}
+{% set console_device = false %}
+{% set extra_nfsroot_args = ",vers=3" %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x15.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x15.jinja2
index 73ebd0ada..844db0a44 100644
--- a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x15.jinja2
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x15.jinja2
@@ -14,8 +14,7 @@
 {% set console_device = console_device|default('ttyS2') %}
 {% set baud_rate = baud_rate|default(115200) %}
 {% set uboot_extra_error_message = 'Invalid partition' %}
-{% set fastboot_sequence = [
-    'reboot'] %}
+{% set fastboot_sequence = ['reboot'] %}
 {% set fastboot_deploy_uboot = "
       u-boot:
         parameters:
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-atom330.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-atom330.jinja2
new file mode 100644
index 000000000..7331f9733
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-atom330.jinja2
@@ -0,0 +1,2 @@
+{% extends 'x86.jinja2' %}
+{% set boot_character_delay = 100 %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-celeron.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-celeron.jinja2
new file mode 100644
index 000000000..7331f9733
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-celeron.jinja2
@@ -0,0 +1,2 @@
+{% extends 'x86.jinja2' %}
+{% set boot_character_delay = 100 %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-pentium4.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-pentium4.jinja2
new file mode 100644
index 000000000..ce63a9fbf
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-pentium4.jinja2
@@ -0,0 +1,3 @@
+{% extends 'base-grub.jinja2' %}
+{% set boot_character_delay = 300 %}
+{% set action_timeout_bootloader_interrupt = 60 %}
diff --git a/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-x5-z8350.jinja2 b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-x5-z8350.jinja2
new file mode 100644
index 000000000..b380dfa0f
--- /dev/null
+++ b/lkft.validation.linaro.org/master-configs/lkft-master.lkftlab/lava-server/dispatcher-config/device-types/x86-x5-z8350.jinja2
@@ -0,0 +1,4 @@
+{% extends 'base-grub.jinja2' %}
+{% set boot_character_delay = 100 %}
+{% set efi_grub = True %}
+{% set action_timeout_bootloader_interrupt = 300 %}