Merge lp:~dpigott/lava-lab/add-tc2-benchmark-device into lp:lava-lab

[Dave Pigott]

[Dave Pigott (dpigott)]

review: Approve

=== added file 'lava/device-types/vexpress-tc2-backup.conf'
--- lava/device-types/vexpress-tc2-backup.conf	1970-01-01 00:00:00 +0000
+++ lava/device-types/vexpress-tc2-backup.conf	2013-06-19 12:48:33 +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

=== renamed file 'lava/devices/dispatcher01/production/vexpress-tc2-03.conf' => 'lava/devices/dispatcher01/production/vexpress-tc2-benchmark-01.conf'
--- lava/devices/dispatcher01/production/vexpress-tc2-03.conf	2013-06-19 10:11:44 +0000
+++ lava/devices/dispatcher01/production/vexpress-tc2-benchmark-01.conf	2013-06-19 12:48:33 +0000
@@ -1,5 +1,5 @@
 # DO NOT EDIT: MANAGED BY SALT!
-device_type = vexpress-tc2
+device_type = vexpress-tc2-benchmark
 reset_port_command = flock /var/lock/serial3.lock /usr/local/lab-scripts/reset-serial5000 serial3 1
 connection_command = telnet serial3 7001
 hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu07 01