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

Proposed by Dave Pigott on 2013-07-31
Status: Rejected
Rejected by: Neil Williams on 2014-07-02
Proposed branch: lp:~dpigott/lava-dispatcher/bring-device-type-configs-up-to-date
Merge into: lp:lava-dispatcher
Diff against target: 217 lines (+141/-7)
7 files modified
lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf (+1/-0)
lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf (+1/-0)
lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf (+12/-0)
lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf (+31/-7)
lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf (+30/-0)
lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf (+30/-0)
lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2-benchmark.conf (+36/-0)
To merge this branch: bzr merge lp:~dpigott/lava-dispatcher/bring-device-type-configs-up-to-date
Reviewer Review Type Date Requested Status
Linaro Validation Team 2013-07-31 Pending
Review via email: mp+177805@code.launchpad.net

Description of the change

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

To post a comment you must log in.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1boot_part = 21boot_part = 2
2root_part = 32root_part = 3
3testboot_offset = 3
3boot_cmds = mmc rescan,4boot_cmds = mmc rescan,
4 mmc part 1,5 mmc part 1,
5 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'",6 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'",
67
=== 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 @@
1boot_part = 21boot_part = 2
2root_part = 32root_part = 3
3testboot_offset = 3
3boot_cmds = mmc init,4boot_cmds = mmc init,
4 mmc part 0,5 mmc part 0,
5 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'",6 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'",
67
=== 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 @@
27 vram=48M omapfb.vram=0:24M'",27 vram=48M omapfb.vram=0:24M'",
28 boot28 boot
2929
30boot_cmds_fdt = mmc init,
31 setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x81600000 uInitrd; fatload 0:3 0x815f0000 board.dtb; bootm 0x80200000 0x81600000 0x815f0000'",
32 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'",
33 boot
34
35boot_options =
36 boot_cmds
37
38[boot_cmds]
39default = boot_cmds
40allowed = boot_cmds, boot_cmds_android, boot_cmds_fdt
41
30android_binary_drivers = http://192.168.1.21/LAVA_HTTP/android-binaries/panda-drivers.tgz42android_binary_drivers = http://192.168.1.21/LAVA_HTTP/android-binaries/panda-drivers.tgz
31possible_partitions_files =43possible_partitions_files =
32 init.partitions.rc44 init.partitions.rc
3345
=== 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 @@
1boot_cmds = mmc rescan 0,1boot_device = 1
2
3boot_cmd = mmc rescan 0,
2 setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage;4 setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage;
3 bootm 0x00100000'",5 bootm 0x00100000'",
4 setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M 6 setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M
@@ -6,21 +8,43 @@
6 hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",8 hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
7 boot9 boot
810
9boot_cmds_android = mmc rescan 0,11boot_cmds = mmc rescan 1,
10 setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage; fat load mmc 0:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",12 setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage;
13 bootm 0x00100000'",
14 setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M
15 root=/dev/mmcblk1p5 rootwait mem=128M@0 mali.mali_mem=32M@128M
16 hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
17 boot
18
19boot_cmds_android = mmc rescan 1,
20 setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage'",
11 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'",21 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'",
12 boot22 boot
13 23
24boot_cmds_fdt = mmc rescan 1,
25 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'"
26 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'",
27 boot
28
14bootloader_prompt = $29bootloader_prompt = $
1530
16lmc_dev_arg = snowball_sd31lmc_dev_arg = snowball_sd
1732
33
18soft_boot_cmd = echo "Restarting system."34soft_boot_cmd = echo "Restarting system."
19 echo 0x02 > /sys/kernel/debug/ab8500/register-bank35 echo 0x02 > /sys/kernel/debug/ab8500/register-bank
20 echo 0x02 > /sys/kernel/debug/ab8500/register-address36 echo 0x02 > /sys/kernel/debug/ab8500/register-address
21 echo 0x01 > /sys/kernel/debug/ab8500/register-value37 echo 0x01 > /sys/kernel/debug/ab8500/register-value
22 echo 0x01 > /sys/kernel/debug/ab8500/register-address 38 echo 0x01 > /sys/kernel/debug/ab8500/register-address
23 echo 0x11 > /sys/kernel/debug/ab8500/register-value39 echo 0x11 > /sys/kernel/debug/ab8500/register-value
2440
25android_orig_block_device = mmcblk041android_orig_block_device = mmcblk1
26android_lava_block_device = mmcblk042android_lava_block_device = mmcblk1
43
44boot_options =
45 boot_cmds
46
47[boot_cmds]
48default = boot_cmds
49allowed = boot_cmds, boot_cmds_android, boot_cmds_fdt
50
2751
=== 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 @@
1# DO NOT EDIT: MANAGED BY SALT!
2boot_cmds = 2
3
4boot_cmds_android = 3
5
6interrupt_boot_prompt = The default boot selection will start in
7
8bootloader_prompt = Start:
9
10client_type = vexpress
11
12image_boot_msg = Booting Linux
13
14lmc_dev_arg = vexpress
15
16possible_partitions_files =
17 init.partitions.rc
18 fstab.partitions
19 init.rc
20 fstab.arm-versatileexpress
21
22uefi_image_filename = uefi_v2p-ca5s.bin
23
24vexpress_uefi_path = SOFTWARE/A5/uefi.bin
25
26vexpress_uefi_backup_path = SOFTWARE/A5/backup-uefi.bin
27
28vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD
29
30read_boot_cmds_from_image = 0
031
=== 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 @@
1# DO NOT EDIT: MANAGED BY SALT!
2boot_cmds = 2
3
4boot_cmds_android = 3
5
6interrupt_boot_prompt = The default boot selection will start in
7
8bootloader_prompt = Start:
9
10client_type = vexpress
11
12image_boot_msg = Booting Linux
13
14lmc_dev_arg = vexpress
15
16possible_partitions_files =
17 init.partitions.rc
18 fstab.partitions
19 init.rc
20 fstab.arm-versatileexpress
21
22uefi_image_filename = uefi_v2p-ca9.bin
23
24vexpress_uefi_path = SOFTWARE/A9/uefi.bin
25
26vexpress_uefi_backup_path = SOFTWARE/A9/backup-uefi.bin
27
28vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD
29
30read_boot_cmds_from_image = 0
031
=== 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 @@
1client_type = vexpress
2
3boot_cmds = 2
4
5boot_cmds_android = 3
6
7interrupt_boot_prompt = The default boot selection will start in
8
9bootloader_prompt = Start:
10
11image_boot_msg = Booting Linux
12
13lmc_dev_arg = vexpress
14
15possible_partitions_files =
16 init.partitions.rc
17 fstab.partitions
18 init.rc
19 fstab.arm-versatileexpress
20
21uefi_image_filename = uefi_v2p-ca15-tc2.bin
22
23vexpress_uefi_path = SOFTWARE/TC2/uefi.bin
24
25vexpress_uefi_backup_path = SOFTWARE/TC2/backup-uefi.bin
26
27vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD
28
29read_boot_cmds_from_image = 0
30
31android_orig_block_device = mmcblk0
32android_lava_block_device = sda
33partition_padding_string_android =
34sys_part_android = 1
35sdcard_part_android = 3
36data_part_android = 2

Subscribers

People subscribed via source and target branches