Merge lp:~dpigott/lava-lab/make-lava-lab-have-all-device-configs into lp:lava-lab

[Dave Pigott]

ok - so we have device-type configs in two places - the dispatcher and lava-lab, and any values in lava-lab override ones in dispatcher. What I've done is to make sure that lava-lab is up to date, taking care not to override any existing configs.

It strikes me that we have another problem to solve: Having device configs in two places, which are out of step. lava-lab needs to hold the current set, and any changes to it need to be reflected back into the dispatcher. The reason we need lava-lab to be definitive is that means we can re-salt to update a device type, rather than having to deploy a potentially unstable dispatcher.

I'm not self approving this, because it needs discussion, but it's already resulted in a fastmodels device failing because its dispatcher was wound back too far and the dispatcher didn't have the config for it and neither did lava-lab.

Unmerged revisions

200. By Dave Pigott on 2013-06-27

Update to latest

199. By Dave Pigott on 2013-06-27

Make lava-lab the definitive device-type list

=== added file 'lava/device-types/beagle-xm.conf'
--- lava/device-types/beagle-xm.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/beagle-xm.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,23 @@
+boot_cmds = mmc init, 
+	mmc part 0, 
+    setenv bootcmd "'fatload mmc 0:3 0x80000000 uImage; 
+    fatload mmc 0:3 0x81600000 uInitrd; 
+    bootm 0x80000000 0x81600000'",
+    setenv bootargs "' console=tty0 console=ttyO2,115200n8
+    root=LABEL=testrootfs rootwait ro earlyprintk fixrtc nocompcache
+    vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60'",
+    boot
+
+boot_cmds_android = mmc init,
+	mmc part 0,
+	setenv bootcmd "'fatload mmc 0:3 0x80000000 uImage;
+	fatload mmc 0:3 0x81600000 uInitrd;
+	bootm 0x80000000 0x81600000'",
+	setenv bootargs "'console=tty0 console=ttyO2,115200n8 
+	rootwait rw earlyprintk fixrtc nocompcache 
+	vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60 
+	init=/init androidboot.console=ttyO2'",
+	boot
+
+qemu_machine_type = beaglexm
+lmc_dev_arg = beagle
 
=== added file 'lava/device-types/beaglebone-black.conf'
--- lava/device-types/beaglebone-black.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/beaglebone-black.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,21 @@
+boot_cmds_oe = 
+    setenv initrd_high "'0xffffffff'",
+    setenv fdt_high "'0xffffffff'",
+    setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x815f0000 board.dtb; bootm 0x80200000 - 0x815f0000'",
+    setenv bootargs "'console=ttyO0,115200n8 root=/dev/mmcblk0p5 rootwait ro'",
+    boot
+
+boot_cmds = 
+    setenv initrd_high "'0xffffffff'",
+    setenv fdt_high "'0xffffffff'",
+    setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x81600000 uInitrd; fatload mmc 0:3 0x815f0000 board.dtb; bootm 0x80200000 0x81600000 0x815f0000'",
+    setenv bootargs "'console=ttyO0,115200n8 root=LABEL=testrootfs rootwait ro'",
+    boot
+
+lmc_dev_arg = beaglebone
+
+boot_options =
+    boot_cmds
+
+[boot_cmds]
+default = boot_cmds
 
=== added file 'lava/device-types/beaglebone.conf'
--- lava/device-types/beaglebone.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/beaglebone.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,21 @@
+boot_cmds_oe = 
+    setenv initrd_high "'0xffffffff'",
+    setenv fdt_high "'0xffffffff'",
+    setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x815f0000 board.dtb; bootm 0x80200000 - 0x815f0000'",
+    setenv bootargs "'console=ttyO0,115200n8 root=/dev/mmcblk0p5 rootwait ro'",
+    boot
+
+boot_cmds = 
+    setenv initrd_high "'0xffffffff'",
+    setenv fdt_high "'0xffffffff'",
+    setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x81600000 uInitrd; fatload mmc 0:3 0x815f0000 board.dtb; bootm 0x80200000 0x81600000 0x815f0000'",
+    setenv bootargs "'console=ttyO0,115200n8 root=LABEL=testrootfs rootwait ro'",
+    boot
+
+lmc_dev_arg = beaglebone
+
+boot_options =
+    boot_cmds
+
+[boot_cmds]
+default = boot_cmds
 
=== added file 'lava/device-types/capri.conf'
--- lava/device-types/capri.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/capri.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,46 @@
+client_type = capri
+
+# The ADB command line.
+#
+# In the case where there are multiple android devices plugged into a
+# single host, this connection command must be overriden on each device to
+# include the serial number of the device, e.g.
+#
+#   serial_number = XXXXXXXXXXXXXXXX
+#   adb_command = adb -s %(serial_number)s
+adb_command = adb
+
+# The fastboot command.
+#
+# The same as above: if you have more than one device, you will want to
+# override this in your device config to add a serial number, e.g.
+#
+#   serial_number = XXXXXXXXXXXXXXXX
+#   fastboot_command = fastboot -s %(serial_number)s
+#
+# Of course, in the case you override both adb_command *and* fastboot_command,
+# you don't need to specify `serial_number` twice.
+fastboot_command = fastboot
+
+# Working directory for temporary files. By default, the usual place for LAVA
+# images will be used.
+#
+# This is useful when the lava dispatcher is controlling the device under test which is
+# physically plugged to other machines by setting adb_command to something like
+# "ssh <phone-host> adb" and fastboot_command to something like "ssh
+# <phone-host> fastboot". adb and fastboot always operate on local files, so
+# you need your local files to also be seen as local files on the host where
+# adb/fastboot are executed.
+#
+# In this case, you should set shared_working_directory to a shared directory
+# between the machine running the dispatcher and the machine where the phone is
+# plugged.  This shared directory must have the same path in both machines.
+# For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at
+# <phone-host> (or the other way around).
+shared_working_directory =
+
+connection_command = %(adb_command)s shell
+
+enable_network_after_boot_android = false
+android_adb_over_usb = true
+android_adb_over_tcp = false
 
=== added file 'lava/device-types/highbank.conf'
--- lava/device-types/highbank.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/highbank.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,2 @@
+client_type = highbank
+connection_command = ipmitool -I lanplus -U admin -P admin -H %(ecmeip)s sol activate
 
=== added file 'lava/device-types/k3v2.conf'
--- lava/device-types/k3v2.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/k3v2.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,46 @@
+client_type = k3v2
+
+# The ADB command line.
+#
+# In the case where there are multiple android devices plugged into a
+# single host, this connection command must be overriden on each device to
+# include the serial number of the device, e.g.
+#
+#   serial_number = XXXXXXXXXXXXXXXX
+#   adb_command = adb -s %(serial_number)s
+adb_command = adb
+
+# The fastboot command.
+#
+# The same as above: if you have more than one device, you will want to
+# override this in your device config to add a serial number, e.g.
+#
+#   serial_number = XXXXXXXXXXXXXXXX
+#   fastboot_command = fastboot -s %(serial_number)s
+#
+# Of course, in the case you override both adb_command *and* fastboot_command,
+# you don't need to specify `serial_number` twice.
+fastboot_command = fastboot
+
+# Working directory for temporary files. By default, the usual place for LAVA
+# images will be used.
+#
+# This is useful when the lava dispatcher is controlling the device under test which is
+# physically plugged to other machines by setting adb_command to something like
+# "ssh <phone-host> adb" and fastboot_command to something like "ssh
+# <phone-host> fastboot". adb and fastboot always operate on local files, so
+# you need your local files to also be seen as local files on the host where
+# adb/fastboot are executed.
+#
+# In this case, you should set shared_working_directory to a shared directory
+# between the machine running the dispatcher and the machine where the phone is
+# plugged.  This shared directory must have the same path in both machines.
+# For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at
+# <phone-host> (or the other way around).
+shared_working_directory =
+
+connection_command = %(adb_command)s shell
+
+enable_network_after_boot_android = false
+android_adb_over_usb = true
+android_adb_over_tcp = false
 
=== added file 'lava/device-types/kvm.conf'
--- lava/device-types/kvm.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/kvm.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,3 @@
+client_type = qemu
+qemu_binary = qemu-system-x86_64
+qemu_options = -machine accel=kvm:tcg -hda {DISK_IMAGE} -nographic
 
=== added file 'lava/device-types/mx51evk.conf'
--- lava/device-types/mx51evk.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/mx51evk.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,11 @@
+boot_part = 2
+root_part = 3
+boot_cmds = mmc init,
+    mmc part 0,
+    setenv bootcmd "'fatload mmc 0:5 0x90000000 uImage; fatload mmc 0:5 
+    0x92000000 uInitrd; fatload mmc 0:5 0x91ff0000 board.dtb; bootm 
+    0x90000000 0x92000000 0x91ff0000'",
+    setenv bootargs "' console=tty0 console=ttymxc0,115200n8 
+    root=LABEL=testrootfs rootwait ro'",
+    boot
+bootloader_prompt = >
 
=== added file 'lava/device-types/mx53loco.conf'
--- lava/device-types/mx53loco.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/mx53loco.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,30 @@
+boot_part = 2
+root_part = 3
+boot_cmds = mmc init,
+    mmc part 0,
+    setenv bootcmd "'fatload mmc 0:5 0x70800000 uImage; fatload mmc 
+    0:5 0x71800000 uInitrd; bootm 0x70800000 0x71800000'",
+    setenv bootargs "' console=tty0 console=ttymxc0,115200n8 
+    root=LABEL=testrootfs rootwait ro'",
+    boot
+
+# Original linaro-android-media-create generated Android system SD card layout
+boot_part_android_org = 2
+sys_part_android_org = 3
+cache_part_android_org = 5
+data_part_android_org = 6
+sdcard_part_android_org = 7
+
+# Android LAVA test image SD card layout
+sys_part_android = 6
+sdcard_part_android = 7
+data_part_android = 7
+boot_cmds_android = mmc init,
+    mmc part 0,
+    setenv bootcmd "'fatload mmc 0:5 0x70000000 uImage;
+    fatload mmc 0:5 0x72000000 uInitrd; bootm 0x70000000 0x72000000'",
+    setenv bootargs "'console=tty0 console=ttymxc0,115200n8 
+    rootwait ro earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve
+    init=/init androidboot.console=ttymxc0'",
+    boot
+bootloader_prompt = >
 
=== added file 'lava/device-types/nexus.conf'
--- lava/device-types/nexus.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/nexus.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,46 @@
+client_type = fastboot
+
+# The ADB command line.
+#
+# In the case where there are multiple android devices plugged into a
+# single host, this connection command must be overriden on each device to
+# include the serial number of the device, e.g.
+#
+#   serial_number = XXXXXXXXXXXXXXXX
+#   adb_command = adb -s %(serial_number)s
+adb_command = adb
+
+# The fastboot command.
+#
+# The same as above: if you have more than one device, you will want to
+# override this in your device config to add a serial number, e.g.
+#
+#   serial_number = XXXXXXXXXXXXXXXX
+#   fastboot_command = fastboot -s %(serial_number)s
+#
+# Of course, in the case you override both adb_command *and* fastboot_command,
+# you don't need to specify `serial_number` twice.
+fastboot_command = fastboot
+
+# Working directory for temporary files. By default, the usual place for LAVA
+# images will be used.
+#
+# This is useful when the lava dispatcher is controlling the device under test which is
+# physically plugged to other machines by setting adb_command to something like
+# "ssh <phone-host> adb" and fastboot_command to something like "ssh
+# <phone-host> fastboot". adb and fastboot always operate on local files, so
+# you need your local files to also be seen as local files on the host where
+# adb/fastboot are executed.
+#
+# In this case, you should set shared_working_directory to a shared directory
+# between the machine running the dispatcher and the machine where the phone is
+# plugged.  This shared directory must have the same path in both machines.
+# For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at
+# <phone-host> (or the other way around).
+shared_working_directory =
+
+connection_command = %(adb_command)s shell
+
+enable_network_after_boot_android = false
+android_adb_over_usb = true
+android_adb_over_tcp = false
 
=== added file 'lava/device-types/nexus10.conf'
--- lava/device-types/nexus10.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/nexus10.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,46 @@
+client_type = nexus10
+
+# The ADB command line.
+#
+# In the case where there are multiple android devices plugged into a
+# single host, this connection command must be overriden on each device to
+# include the serial number of the device, e.g.
+#
+#   serial_number = XXXXXXXXXXXXXXXX
+#   adb_command = adb -s %(serial_number)s
+adb_command = adb
+
+# The fastboot command.
+#
+# The same as above: if you have more than one device, you will want to
+# override this in your device config to add a serial number, e.g.
+#
+#   serial_number = XXXXXXXXXXXXXXXX
+#   fastboot_command = fastboot -s %(serial_number)s
+#
+# Of course, in the case you override both adb_command *and* fastboot_command,
+# you don't need to specify `serial_number` twice.
+fastboot_command = fastboot
+
+# Working directory for temporary files. By default, the usual place for LAVA
+# images will be used.
+#
+# This is useful when the lava dispatcher is controlling the device under test which is
+# physically plugged to other machines by setting adb_command to something like
+# "ssh <phone-host> adb" and fastboot_command to something like "ssh
+# <phone-host> fastboot". adb and fastboot always operate on local files, so
+# you need your local files to also be seen as local files on the host where
+# adb/fastboot are executed.
+#
+# In this case, you should set shared_working_directory to a shared directory
+# between the machine running the dispatcher and the machine where the phone is
+# plugged.  This shared directory must have the same path in both machines.
+# For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at
+# <phone-host> (or the other way around).
+shared_working_directory =
+
+connection_command = %(adb_command)s shell
+
+enable_network_after_boot_android = false
+android_adb_over_usb = true
+android_adb_over_tcp = false
 
=== added file 'lava/device-types/qemu.conf'
--- lava/device-types/qemu.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/qemu.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,7 @@
+client_type=qemu
+
+qemu_binary = qemu-system-arm
+qemu_options = -M %(qemu_machine_type)s -drive if=%(qemu_drive_interface)s,cache=writeback,file={DISK_IMAGE} -clock unix -device usb-kbd -device usb-mouse -usb -device usb-net,netdev=mynet -netdev user,id=mynet -net nic -net user -nographic
+
+qemu_machine_type = beaglexm
+qemu_drive_interface = sd
 
=== added file 'lava/device-types/rtsm_foundation-armv8.conf'
--- lava/device-types/rtsm_foundation-armv8.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/rtsm_foundation-armv8.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,20 @@
+client_type=fastmodel
+
+# how long the disablesuspend script should take to complete
+# fm takes longer than other android images do
+disablesuspend_timeout = 500
+
+# how long ubuntu takes to boot to prompt
+boot_linaro_timeout = 500
+
+# if you do dhcp on boot, adb will not work (asac) on fastmodels
+enable_network_after_boot_android = 0
+
+# we do usermode networking over the loopback
+default_network_interface = lo
+
+simulator_axf_files = img-foundation.axf
+
+simulator_version_command = /opt/arm/Foundation_v8pkg/Foundation_v8 --version | grep "ARM V8 Foundation Model" | sed 's/ARM V8 Foundation Model //'
+
+simulator_command = sudo -u www-data /opt/arm/Foundation_v8pkg/Foundation_v8 --image={AXF} --block-device={IMG} --network=nat
 
=== added file 'lava/device-types/rtsm_ve-a15x1-a7x1.conf'
--- lava/device-types/rtsm_ve-a15x1-a7x1.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/rtsm_ve-a15x1-a7x1.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,111 @@
+client_type=fastmodel
+
+# how long the disablesuspend script should take to complete
+# fm takes longer than other android images do
+disablesuspend_timeout = 500
+
+# how long ubuntu takes to boot to prompt
+boot_linaro_timeout = 800
+
+# if you do dhcp on boot, adb will not work (asac) on fastmodels
+enable_network_after_boot_android = 0
+
+# we do usermode networking over the loopback
+default_network_interface = lo
+
+bootloader_prompt = Start:
+
+interrupt_boot_prompt = The default boot selection will start in
+
+interrupt_boot_command = break
+
+# UEFI boot commands
+boot_cmds = sendline a,
+           expect Choice:,
+           sendline 1,
+           expect Select the Boot Device:,
+           sendline 2,
+           expect File path of the EFI Application or the kernel:,
+           sendline uImage,
+           expect [a/g/l],
+           sendline l,
+           expect Add an initrd: [y/n],
+           sendline y,
+           expect File path of the initrd:,
+           sendline uInitrd,
+           expect Arguments to pass to the binary:,
+           sendline 'console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M',
+           expect File path of the local FDT:,
+           sendline rtsm\\rtsm_ve-ca15x1-ca7x1.dtb,
+           expect Description for this new Entry:,
+           sendline Test Image,
+           expect Choice:,
+           sendline 5,
+           expect Start:,
+           sendline 2
+
+simulator_axf_files =
+	img.axf
+	linux-system-ISW.axf
+	rtsm/linux-system-semi.axf
+
+simulator_kernel = vmlinuz.*
+simulator_initrd = initrd.*
+simulator_dtb = rtsm_ve-ca15x1-ca7x1.dtb
+simulator_uefi = uefi_rtsm_ve-ca15.bin
+
+license_file = 8224@localhost
+sim_bin = /opt/arm/RTSM_A15-A7x14_VE/Linux64_RTSM_VE_Cortex-A15x4-A7x4/RTSM_VE_Cortex-A15x4-A7x4
+android_adb_port = 6555
+
+simulator_version_command = %(sim_bin)s --version | grep "Fast Models" | sed 's/Fast Models \[//' | sed 's/\]//'
+
+simulator_boot_wrapper = -a coretile.cluster0.*={AXF}
+
+simulator_command = sudo -u www-data ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s
+
+boot_options =
+        motherboard.mmc.p_mmc_file
+	motherboard.hostbridge.userNetPorts
+	motherboard.smsc_91c111.enabled
+	motherboard.hostbridge.userNetworking
+        motherboard.flashloader0.fname
+        motherboard.flashloader1.fname
+        motherboard.flashloader1.fnameWrite
+	coretile.cache_state_modelled
+	coretile.cluster0.cpu0.semihosting-enable
+	coretile.cluster0.cpu0.semihosting-cmd_line
+
+[motherboard.mmc.p_mmc_file]
+default = {IMG}
+
+[motherboard.hostbridge.userNetPorts]
+default="%(android_adb_port)s=%(android_adb_port)s"
+
+[motherboard.smsc_91c111.enabled]
+default = 1
+allowed = 0,1
+
+[motherboard.hostbridge.userNetworking]
+default = 1
+allowed = 0,1
+
+[motherboard.flashloader0.fname]
+default = {UEFI}
+
+[motherboard.flashloader1.fname]
+default = uefi-vars.fd
+
+[motherboard.flashloader1.fnameWrite]
+default = uefi-vars.fd
+
+[coretile.cache_state_modelled]
+default = 0
+allowed = 0,1
+
+[coretile.cluster0.cpu0.semihosting-enable]
+default = 1
+allowed = 0,1
+
+[coretile.cluster0.cpu0.semihosting-cmd_line]
+default = "--kernel {KERNEL} --dtb {DTB} --initrd {INITRD} -- console=ttyAMA0,38400n8  root=/dev/mmcblk0p2  rootwait ro mem=1024M"
 
=== added file 'lava/device-types/rtsm_ve-a15x4-a7x4.conf'
--- lava/device-types/rtsm_ve-a15x4-a7x4.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/rtsm_ve-a15x4-a7x4.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,111 @@
+client_type=fastmodel
+
+# how long the disablesuspend script should take to complete
+# fm takes longer than other android images do
+disablesuspend_timeout = 500
+
+# how long ubuntu takes to boot to prompt
+boot_linaro_timeout = 800
+
+# if you do dhcp on boot, adb will not work (asac) on fastmodels
+enable_network_after_boot_android = 0
+
+# we do usermode networking over the loopback
+default_network_interface = lo
+
+bootloader_prompt = Start:
+
+interrupt_boot_prompt = The default boot selection will start in
+
+interrupt_boot_command = break
+
+# UEFI boot commands
+boot_cmds = sendline a,
+           expect Choice:,
+           sendline 1,
+           expect Select the Boot Device:,
+           sendline 2,
+           expect File path of the EFI Application or the kernel:,
+           sendline uImage,
+           expect [a/g/l],
+           sendline l,
+           expect Add an initrd: [y/n],
+           sendline y,
+           expect File path of the initrd:,
+           sendline uInitrd,
+           expect Arguments to pass to the binary:,
+           sendline 'console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M',
+           expect File path of the local FDT:,
+           sendline rtsm\\rtsm_ve-ca15x4-ca7x4.dtb,
+           expect Description for this new Entry:,
+           sendline Test Image,
+           expect Choice:,
+           sendline 5,
+           expect Start:,
+           sendline 2
+
+simulator_axf_files =
+	img.axf
+	linux-system-ISW.axf
+	rtsm/linux-system-semi.axf
+
+simulator_kernel = vmlinuz.*
+simulator_initrd = initrd.*
+simulator_dtb = rtsm_ve-ca15x4-ca7x4.dtb
+simulator_uefi = uefi_rtsm_ve-ca15.bin
+
+license_file = 8224@localhost
+sim_bin = /opt/arm/RTSM_A15-A7x14_VE/Linux64_RTSM_VE_Cortex-A15x4-A7x4/RTSM_VE_Cortex-A15x4-A7x4
+android_adb_port = 6555
+
+simulator_version_command = %(sim_bin)s --version | grep "Fast Models" | sed 's/Fast Models \[//' | sed 's/\]//'
+
+simulator_boot_wrapper = -a coretile.cluster0.*={AXF}
+
+simulator_command = sudo -u www-data ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s
+
+boot_options =
+        motherboard.mmc.p_mmc_file
+	motherboard.hostbridge.userNetPorts
+	motherboard.smsc_91c111.enabled
+	motherboard.hostbridge.userNetworking
+        motherboard.flashloader0.fname
+        motherboard.flashloader1.fname
+        motherboard.flashloader1.fnameWrite
+	coretile.cache_state_modelled
+	coretile.cluster0.cpu0.semihosting-enable
+	coretile.cluster0.cpu0.semihosting-cmd_line
+
+[motherboard.mmc.p_mmc_file]
+default = {IMG}
+
+[motherboard.hostbridge.userNetPorts]
+default="%(android_adb_port)s=%(android_adb_port)s"
+
+[motherboard.smsc_91c111.enabled]
+default = 1
+allowed = 0,1
+
+[motherboard.hostbridge.userNetworking]
+default = 1
+allowed = 0,1
+
+[motherboard.flashloader0.fname]
+default = {UEFI}
+
+[motherboard.flashloader1.fname]
+default = uefi-vars.fd
+
+[motherboard.flashloader1.fnameWrite]
+default = uefi-vars.fd
+
+[coretile.cache_state_modelled]
+default = 0
+allowed = 0,1
+
+[coretile.cluster0.cpu0.semihosting-enable]
+default = 1
+allowed = 0,1
+
+[coretile.cluster0.cpu0.semihosting-cmd_line]
+default = "--kernel {KERNEL} --dtb {DTB} --initrd {INITRD} -- console=ttyAMA0,38400n8  root=/dev/mmcblk0p2  rootwait ro mem=1024M"
 
=== added file 'lava/device-types/rtsm_ve-armv8.conf'
--- lava/device-types/rtsm_ve-armv8.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/rtsm_ve-armv8.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,128 @@
+client_type=fastmodel
+
+# how long the disablesuspend script should take to complete
+# fm takes longer than other android images do
+disablesuspend_timeout = 500
+
+# how long ubuntu takes to boot to prompt
+boot_linaro_timeout = 500
+
+#after enabled the network, we can set it to true
+enable_network_after_boot_android = 1
+
+# change to use eth0 after we enabled the network
+default_network_interface = eth0
+
+bootloader_prompt = Start:
+
+interrupt_boot_prompt = The default boot selection will start in
+
+interrupt_boot_command = break
+
+# UEFI boot commands
+boot_cmds = sendline a,
+           expect Choice:,
+           sendline 1,
+           expect Select the Boot Device:,
+           sendline 2,
+           expect File path of the EFI Application or the kernel:,
+           sendline uImage,
+           expect [a/g/l],
+           sendline l,
+           expect Add an initrd: [y/n],
+           sendline y,
+           expect File path of the initrd:,
+           sendline uInitrd,
+           expect Arguments to pass to the binary:,
+           sendline 'console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M',
+           expect File path of the local FDT:,
+           sendline rtsm\\rtsm_ve-ca15x1-ca7x1.dtb,
+           expect Description for this new Entry:,
+           sendline Test Image,
+           expect Choice:,
+           sendline 5,
+           expect Start:,
+           sendline 2
+
+simulator_axf_files = linux-system.axf
+
+license_file = 8224@localhost
+sim_bin = /opt/arm/RTSMv8_VE/bin/model_shell64
+sim_model = /opt/arm/RTSMv8_VE/models/Linux64_GCC-4.1/RTSM_VE_AEMv8A.so
+android_adb_port = 5555
+interfaceName = armv8_01
+
+simulator_version_command = %(sim_bin)s --version | grep "Model Shell" | sed 's/Model Shell //'
+
+simulator_boot_wrapper = -a {AXF}
+
+simulator_command = sudo -u www-data ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s %(sim_model)s
+
+boot_options =
+        motherboard.mmc.p_mmc_file
+	motherboard.smsc_91c111.enabled
+	cluster.NUM_CORES
+	cluster.cpu0.unpredictable_WPMASKANDBAS
+	cluster.cpu0.unpredictable_non-contigous_BAS
+	cluster.cpu1.unpredictable_WPMASKANDBAS
+	cluster.cpu1.unpredictable_non-contigous_BAS
+	cluster.cpu2.unpredictable_WPMASKANDBAS
+	cluster.cpu2.unpredictable_non-contigous_BAS
+	cluster.cpu3.unpredictable_WPMASKANDBAS
+	cluster.cpu3.unpredictable_non-contigous_BAS
+	cluster.take_ccfail_undef
+	motherboard.hostbridge.interfaceName
+	motherboard.smsc_91c111.mac_address
+
+[motherboard.smsc_91c111.mac_address]
+default="auto"
+
+[motherboard.hostbridge.interfaceName]
+default="%(interfaceName)s"
+
+[motherboard.mmc.p_mmc_file]
+default = {IMG}
+
+[motherboard.smsc_91c111.enabled]
+default = 1
+allowed = 0,1
+
+[cluster.NUM_CORES]
+default = 1
+allowed = 0,1
+
+[cluster.cpu0.unpredictable_WPMASKANDBAS]
+default = 0
+allowed = 0,1
+
+[cluster.cpu0.unpredictable_non-contigous_BAS]
+default = 0
+allowed = 0,1
+
+[cluster.cpu1.unpredictable_WPMASKANDBAS]
+default = 0
+allowed = 0,1
+
+[cluster.cpu1.unpredictable_non-contigous_BAS]
+default = 0
+allowed = 0,1
+
+[cluster.cpu2.unpredictable_WPMASKANDBAS]
+default = 0
+allowed = 0,1
+
+[cluster.cpu2.unpredictable_non-contigous_BAS]
+default = 0
+allowed = 0,1
+
+[cluster.cpu3.unpredictable_WPMASKANDBAS]
+default = 0
+allowed = 0,1
+
+[cluster.cpu3.unpredictable_non-contigous_BAS]
+default = 0
+allowed = 0,1
+
+[cluster.take_ccfail_undef]
+default = 0
+allowed = 0,1
 
=== added file 'lava/device-types/vexpress-tc2.conf'
--- lava/device-types/vexpress-tc2.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/vexpress-tc2.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,36 @@
+client_type = vexpress
+
+boot_cmds = 2
+
+boot_cmds_android = 3
+
+interrupt_boot_prompt = The default boot selection will start in
+
+bootloader_prompt = Start:
+
+image_boot_msg = Booting Linux
+
+lmc_dev_arg = vexpress
+
+possible_partitions_files =
+    init.partitions.rc
+    fstab.partitions
+    init.rc
+    fstab.arm-versatileexpress
+
+uefi_image_filename = uefi_v2p-ca15-tc2.bin 
+
+vexpress_uefi_path = SOFTWARE/TC2/uefi.bin
+
+vexpress_uefi_backup_path = SOFTWARE/TC2/backup-uefi.bin
+
+vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD
+
+read_boot_cmds_from_image = 0
+
+android_orig_block_device = mmcblk0
+android_lava_block_device = sda
+partition_padding_string_android =
+sys_part_android = 1
+sdcard_part_android = 3
+data_part_android = 2
 \ No newline at end of file
 
=== added file 'lava/device-types/vexpress.conf'
--- lava/device-types/vexpress.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/vexpress.conf	2013-06-27 12:23:26 +0000
@@ -0,0 +1,17 @@
+boot_cmds = 2
+
+boot_cmds_android = 3
+
+interrupt_boot_prompt = The default boot selection will start in
+
+bootloader_prompt = Start:
+
+image_boot_msg = Booting Linux
+
+possible_partitions_files =
+    init.partitions.rc
+    fstab.partitions
+    init.rc
+    fstab.arm-versatileexpress
+
+read_boot_cmds_from_image = 0