summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler <tyler.baker@linaro.org>2014-09-26 20:47:27 (GMT)
committerTyler <tyler.baker@linaro.org>2014-09-26 20:47:27 (GMT)
commitd17bd78c907d4c2214a0a8287e342484c3eb38da (patch)
tree1ccdd9770eb968287fbb71f1c042a3a160c955e9
parent8fe6cafad729ac3217b6aa98da93263637b64c7e (diff)
parentee5bc48110584d681c3190217dd0903e7776551c (diff)
downloadlava-dispatcher-d17bd78c907d4c2214a0a8287e342484c3eb38da.tar.gz
lava-dispatcher-d17bd78c907d4c2214a0a8287e342484c3eb38da.tar.xz
Merge branch 'master' into staging
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf148
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf148
-rw-r--r--lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2.conf149
-rw-r--r--lava_dispatcher/device/fastboot_drivers.py2
-rw-r--r--lava_dispatcher/utils.py2
5 files changed, 431 insertions, 18 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
new file mode 100644
index 0000000..5ce3e9b
--- /dev/null
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf
@@ -0,0 +1,148 @@
+# DO NOT EDIT: MANAGED BY SALT!
+
+bootloader_serial_delay_ms = 30
+
+boot_cmds_master = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 1,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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 v2p-ca5s.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Master Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_cmds = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 2,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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=tty0 console=ttyAMA0,38400n8 root=/dev/mmcblk0p5 rootwait ro androidboot.console=ttyAMA0",
+ expect File path of the local FDT:,
+ sendline v2p-ca5s.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Test Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_cmds_oe = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 2,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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=tty0 console=ttyAMA0,38400n8 root=/dev/mmcblk0p5 rootwait ro androidboot.console=ttyAMA0",
+ expect File path of the local FDT:,
+ sendline v2p-ca5s.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Test Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_cmds_android = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 2,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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=tty0 console=ttyAMA0,38400n8 root=/dev/mmcblk0p5 rootwait ro androidboot.console=ttyAMA0",
+ expect File path of the local FDT:,
+ sendline v2p-ca5s.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Android Test Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_retries = 5
+
+interrupt_boot_prompt = The default boot selection will start in
+
+bootloader_prompt = Start:
+
+client_type = vexpress
+
+lmc_dev_arg = vexpress
+
+possible_partitions_files =
+ init.partitions.rc
+ fstab.partitions
+ init.rc
+ fstab.arm-versatileexpress
+
+uefi_image_filename = uefi_v2p-ca5s.bin
+
+vexpress_uefi_path = SOFTWARE/A5/uefi.bin
+
+vexpress_uefi_backup_path = SOFTWARE/A5/backup-uefi.bin
+
+vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD
+
+read_boot_cmds_from_image = 0
+
+boot_options =
+ boot_cmds
+
+[boot_cmds]
+default = boot_cmds
+
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
new file mode 100644
index 0000000..4144766
--- /dev/null
+++ b/lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf
@@ -0,0 +1,148 @@
+# DO NOT EDIT: MANAGED BY SALT!
+
+bootloader_serial_delay_ms = 30
+
+boot_cmds_master = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 1,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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 v2p-ca9.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Master Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_cmds = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 2,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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=tty0 console=ttyAMA0,38400n8 root=/dev/mmcblk0p5 rootwait ro androidboot.console=ttyAMA0",
+ expect File path of the local FDT:,
+ sendline v2p-ca9.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Test Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_cmds_oe = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 2,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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=tty0 console=ttyAMA0,38400n8 root=/dev/mmcblk0p5 rootwait ro androidboot.console=ttyAMA0",
+ expect File path of the local FDT:,
+ sendline v2p-ca9.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Test Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_cmds_android = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 2,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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=tty0 console=ttyAMA0,38400n8 root=/dev/mmcblk0p5 rootwait ro androidboot.console=ttyAMA0",
+ expect File path of the local FDT:,
+ sendline v2p-ca9.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Android Test Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_retries = 5
+
+interrupt_boot_prompt = The default boot selection will start in
+
+bootloader_prompt = Start:
+
+client_type = vexpress
+
+lmc_dev_arg = vexpress
+
+possible_partitions_files =
+ init.partitions.rc
+ fstab.partitions
+ init.rc
+ fstab.arm-versatileexpress
+
+uefi_image_filename = uefi_v2p-ca9.bin
+
+vexpress_uefi_path = SOFTWARE/A9/uefi.bin
+
+vexpress_uefi_backup_path = SOFTWARE/A9/backup-uefi.bin
+
+vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD
+
+read_boot_cmds_from_image = 0
+
+boot_options =
+ boot_cmds
+
+[boot_cmds]
+default = boot_cmds
+
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 624ece3..8857072 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
@@ -1,21 +1,125 @@
client_type = vexpress
-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
-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
+bootloader_serial_delay_ms = 30
+
+boot_cmds_master = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 1,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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 v2p-ca15-tc2.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Master Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_cmds = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 2,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro androidboot.console=ttyAMA0",
+ expect File path of the local FDT:,
+ sendline v2p-ca15-tc2.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Test Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_cmds_oe = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 2,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro androidboot.console=ttyAMA0",
+ expect File path of the local FDT:,
+ sendline v2p-ca15-tc2.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Test Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_cmds_android = sendline a,
+ expect Choice:,
+ sendline 3,
+ expect Delete entry:,
+ sendline 1,
+ expect Choice:,
+ sendline 1,
+ expect Select the Boot Device:,
+ sendline 2,
+ expect File path of the EFI Application or the kernel:,
+ sendline uImage,
+ expect "Boot Type: [a] ATAGS, [g] Global FDT or [l] Local FDT? [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=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro androidboot.console=ttyAMA0",
+ expect File path of the local FDT:,
+ sendline v2p-ca15-tc2.dtb,
+ expect Description for this new Entry:,
+ sendline LAVA Android Test Image,
+ expect Choice:,
+ sendline 5,
+ expect Start:,
+ sendline 1
+
+boot_retries = 5
-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
interrupt_boot_prompt = The default boot selection will start in
+
bootloader_prompt = Start:
+
lmc_dev_arg = vexpress
possible_partitions_files =
@@ -24,12 +128,25 @@ possible_partitions_files =
init.rc
fstab.arm-versatileexpress
-boot_cmds = 2
+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
-boot_cmds_android = 3
+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
boot_options =
boot_cmds
[boot_cmds]
-default = boot_cmds
+default = boot_cmds \ No newline at end of file
diff --git a/lava_dispatcher/device/fastboot_drivers.py b/lava_dispatcher/device/fastboot_drivers.py
index 8b3cce6..f1519ea 100644
--- a/lava_dispatcher/device/fastboot_drivers.py
+++ b/lava_dispatcher/device/fastboot_drivers.py
@@ -181,7 +181,7 @@ class BaseDriver(object):
if dtb is not None:
dtb = self._get_image(dtb)
if self.config.append_dtb:
- self._kernel = append_dtb(kernel, dtb, self._working_dir)
+ self._kernel = append_dtb(kernel, dtb, self.working_dir)
logging.info('Appended dtb to kernel image successfully')
if rootfs is not None:
self._default_boot_cmds = 'boot_cmds_rootfs'
diff --git a/lava_dispatcher/utils.py b/lava_dispatcher/utils.py
index b640dbc..185a54a 100644
--- a/lava_dispatcher/utils.py
+++ b/lava_dispatcher/utils.py
@@ -226,7 +226,7 @@ def create_uimage(kernel, load_addr, tmp_dir, xip, arch='arm'):
def append_dtb(kernel, dtb, tmp_dir):
- uimage_path = '%s/uImage-dtb' % tmp_dir
+ uimage_path = '%s/kernel-dtb' % tmp_dir
cmd = 'cat %s %s > %s' % (kernel, dtb, uimage_path)
logging.info('Appending dtb to kernel image')