Merge lp:~dpigott/lava-dispatcher/bring-device-type-configs-up-to-date into lp:lava-dispatcher

[Dave Pigott]

I spent some time aligning the device-type configs with all the changes in salt. I believe they are now correct, but I'd like a second opinion. Next time we deploy the dispatcher we should clean out the device-types from lava-lab

Unmerged revisions

645. By Dave Pigott on 2013-07-31

Bring arndale device type conf in line with testboot_offset changes

644. By Dave Pigott on 2013-07-31

Bring default device type configs in line with salt

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf	2013-07-02 18:04:30 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf	2013-07-31 11:19:27 +0000
@@ -1,5 +1,6 @@
 boot_part = 2
 root_part = 3
+testboot_offset = 3
 boot_cmds = mmc rescan,
     mmc part 1,
     setenv bootcmd "'fatload mmc 0:5 0x40007000 uImage; fatload mmc 0:5 0x42000000 uInitrd; fatload mmc 0:5 0x41f00000 board.dtb; bootm 0x40007000 0x42000000 0x41f00000'",

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf	2012-12-13 22:04:36 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf	2013-07-31 11:19:27 +0000
@@ -1,5 +1,6 @@
 boot_part = 2
 root_part = 3
+testboot_offset = 3
 boot_cmds = mmc init,
     mmc part 0,
     setenv bootcmd "'fatload mmc 0:5 0x40007000 uImage; fatload mmc 0:5 0x42000000 uInitrd; fatload mmc 0:5 0x41f00000 board.dtb; bootm 0x40007000 0x42000000 0x41f00000'",

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf	2013-01-08 03:31:23 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf	2013-07-31 11:19:27 +0000
@@ -27,6 +27,18 @@
     vram=48M omapfb.vram=0:24M'",
     boot
 
+boot_cmds_fdt = mmc init,
+    setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x81600000 uInitrd; fatload 0:3 0x815f0000 board.dtb; bootm 0x80200000 0x81600000 0x815f0000'",
+    setenv bootargs "'console=tty0 console=ttyO2,115200n8 root=LABEL=testrootfs rootwait ro earlyprintk fixrtc nocompcache vram=48M omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000'",
+    boot
+
+boot_options =
+    boot_cmds
+
+[boot_cmds]
+default = boot_cmds
+allowed = boot_cmds, boot_cmds_android, boot_cmds_fdt 
+
 android_binary_drivers = http://192.168.1.21/LAVA_HTTP/android-binaries/panda-drivers.tgz
 possible_partitions_files =
     init.partitions.rc

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2013-04-18 14:11:37 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2013-07-31 11:19:27 +0000
@@ -1,4 +1,6 @@
-boot_cmds = mmc rescan 0,
+boot_device = 1
+
+boot_cmd  = mmc rescan 0,
     setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage;
     bootm 0x00100000'",
     setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M 
@@ -6,21 +8,43 @@
     hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
     boot
 
-boot_cmds_android = mmc rescan 0,
-    setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage; fat load mmc 0:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
+boot_cmds = mmc rescan 1,
+    setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage;
+    bootm 0x00100000'",
+    setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M
+    root=/dev/mmcblk1p5 rootwait mem=128M@0 mali.mali_mem=32M@128M
+    hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
+    boot
+
+boot_cmds_android = mmc rescan 1,
+    setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage'",
     setenv bootargs "'console=ttyAMA2,115200n8 rootwait ro earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M vmalloc=500M init=/init androidboot.console=ttyAMA2 omapdss.def_disp=hdmi consoleblank=0'",
     boot
-    
+
+boot_cmds_fdt = mmc rescan 1,
+    setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage; fatload mmc 1:3 0x01000000 /uInitrd; fatload mmc 1:3 0x00f00000 /board.dtb; bootm 0x00100000 0x01000000 0x00f00000'"
+    setenv bootargs "'console=ttyAMA2,115200n8 root=/dev/mmcblk1p5 rootwait ro fixrtc nocompcache vmalloc=300M mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
+    boot
+
 bootloader_prompt = $
 
 lmc_dev_arg = snowball_sd
 
+
 soft_boot_cmd = echo "Restarting system."
     echo 0x02 > /sys/kernel/debug/ab8500/register-bank
     echo 0x02 > /sys/kernel/debug/ab8500/register-address
     echo 0x01 > /sys/kernel/debug/ab8500/register-value
-    echo 0x01 > /sys/kernel/debug/ab8500/register-address 
+    echo 0x01 > /sys/kernel/debug/ab8500/register-address
     echo 0x11 > /sys/kernel/debug/ab8500/register-value
 
-android_orig_block_device = mmcblk0
-android_lava_block_device = mmcblk0
+android_orig_block_device = mmcblk1
+android_lava_block_device = mmcblk1
+
+boot_options =
+	boot_cmds
+
+[boot_cmds]
+default = boot_cmds
+allowed = boot_cmds, boot_cmds_android, boot_cmds_fdt
+

=== added file 'lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf	1970-01-01 00:00:00 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf	2013-07-31 11:19:27 +0000
@@ -0,0 +1,30 @@
+# DO NOT EDIT: MANAGED BY SALT!
+boot_cmds = 2
+
+boot_cmds_android = 3
+
+interrupt_boot_prompt = The default boot selection will start in
+
+bootloader_prompt = Start:
+
+client_type = vexpress
+
+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-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

=== added file 'lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf	1970-01-01 00:00:00 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf	2013-07-31 11:19:27 +0000
@@ -0,0 +1,30 @@
+# DO NOT EDIT: MANAGED BY SALT!
+boot_cmds = 2
+
+boot_cmds_android = 3
+
+interrupt_boot_prompt = The default boot selection will start in
+
+bootloader_prompt = Start:
+
+client_type = vexpress
+
+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-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

=== added file 'lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2-benchmark.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2-benchmark.conf	1970-01-01 00:00:00 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2-benchmark.conf	2013-07-31 11:19:27 +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