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
1=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf'
2--- lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf 2013-07-02 18:04:30 +0000
3+++ lava_dispatcher/default-config/lava-dispatcher/device-types/arndale.conf 2013-07-31 11:19:27 +0000
4@@ -1,5 +1,6 @@
5 boot_part = 2
6 root_part = 3
7+testboot_offset = 3
8 boot_cmds = mmc rescan,
9 mmc part 1,
10 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'",
11
12=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf'
13--- lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf 2012-12-13 22:04:36 +0000
14+++ lava_dispatcher/default-config/lava-dispatcher/device-types/origen.conf 2013-07-31 11:19:27 +0000
15@@ -1,5 +1,6 @@
16 boot_part = 2
17 root_part = 3
18+testboot_offset = 3
19 boot_cmds = mmc init,
20 mmc part 0,
21 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'",
22
23=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf'
24--- lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf 2013-01-08 03:31:23 +0000
25+++ lava_dispatcher/default-config/lava-dispatcher/device-types/panda.conf 2013-07-31 11:19:27 +0000
26@@ -27,6 +27,18 @@
27 vram=48M omapfb.vram=0:24M'",
28 boot
29
30+boot_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+
35+boot_options =
36+ boot_cmds
37+
38+[boot_cmds]
39+default = boot_cmds
40+allowed = boot_cmds, boot_cmds_android, boot_cmds_fdt
41+
42 android_binary_drivers = http://192.168.1.21/LAVA_HTTP/android-binaries/panda-drivers.tgz
43 possible_partitions_files =
44 init.partitions.rc
45
46=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf'
47--- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2013-04-18 14:11:37 +0000
48+++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2013-07-31 11:19:27 +0000
49@@ -1,4 +1,6 @@
50-boot_cmds = mmc rescan 0,
51+boot_device = 1
52+
53+boot_cmd = mmc rescan 0,
54 setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage;
55 bootm 0x00100000'",
56 setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M
57@@ -6,21 +8,43 @@
58 hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
59 boot
60
61-boot_cmds_android = mmc rescan 0,
62- setenv bootcmd "'fatload mmc 0:3 0x00100000 /uImage; fat load mmc 0:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
63+boot_cmds = mmc rescan 1,
64+ setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage;
65+ bootm 0x00100000'",
66+ setenv bootargs "'console=ttyAMA2,115200n8 ip=dhcp vmalloc=300M
67+ root=/dev/mmcblk1p5 rootwait mem=128M@0 mali.mali_mem=32M@128M
68+ hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M'",
69+ boot
70+
71+boot_cmds_android = mmc rescan 1,
72+ setenv bootcmd "'fatload mmc 1:3 0x00100000 /uImage'",
73 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'",
74 boot
75-
76+
77+boot_cmds_fdt = mmc rescan 1,
78+ 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'"
79+ 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'",
80+ boot
81+
82 bootloader_prompt = $
83
84 lmc_dev_arg = snowball_sd
85
86+
87 soft_boot_cmd = echo "Restarting system."
88 echo 0x02 > /sys/kernel/debug/ab8500/register-bank
89 echo 0x02 > /sys/kernel/debug/ab8500/register-address
90 echo 0x01 > /sys/kernel/debug/ab8500/register-value
91- echo 0x01 > /sys/kernel/debug/ab8500/register-address
92+ echo 0x01 > /sys/kernel/debug/ab8500/register-address
93 echo 0x11 > /sys/kernel/debug/ab8500/register-value
94
95-android_orig_block_device = mmcblk0
96-android_lava_block_device = mmcblk0
97+android_orig_block_device = mmcblk1
98+android_lava_block_device = mmcblk1
99+
100+boot_options =
101+ boot_cmds
102+
103+[boot_cmds]
104+default = boot_cmds
105+allowed = boot_cmds, boot_cmds_android, boot_cmds_fdt
106+
107
108=== added file 'lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf'
109--- lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf 1970-01-01 00:00:00 +0000
110+++ lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a5.conf 2013-07-31 11:19:27 +0000
111@@ -0,0 +1,30 @@
112+# DO NOT EDIT: MANAGED BY SALT!
113+boot_cmds = 2
114+
115+boot_cmds_android = 3
116+
117+interrupt_boot_prompt = The default boot selection will start in
118+
119+bootloader_prompt = Start:
120+
121+client_type = vexpress
122+
123+image_boot_msg = Booting Linux
124+
125+lmc_dev_arg = vexpress
126+
127+possible_partitions_files =
128+ init.partitions.rc
129+ fstab.partitions
130+ init.rc
131+ fstab.arm-versatileexpress
132+
133+uefi_image_filename = uefi_v2p-ca5s.bin
134+
135+vexpress_uefi_path = SOFTWARE/A5/uefi.bin
136+
137+vexpress_uefi_backup_path = SOFTWARE/A5/backup-uefi.bin
138+
139+vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD
140+
141+read_boot_cmds_from_image = 0
142
143=== added file 'lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf'
144--- lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf 1970-01-01 00:00:00 +0000
145+++ lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-a9.conf 2013-07-31 11:19:27 +0000
146@@ -0,0 +1,30 @@
147+# DO NOT EDIT: MANAGED BY SALT!
148+boot_cmds = 2
149+
150+boot_cmds_android = 3
151+
152+interrupt_boot_prompt = The default boot selection will start in
153+
154+bootloader_prompt = Start:
155+
156+client_type = vexpress
157+
158+image_boot_msg = Booting Linux
159+
160+lmc_dev_arg = vexpress
161+
162+possible_partitions_files =
163+ init.partitions.rc
164+ fstab.partitions
165+ init.rc
166+ fstab.arm-versatileexpress
167+
168+uefi_image_filename = uefi_v2p-ca9.bin
169+
170+vexpress_uefi_path = SOFTWARE/A9/uefi.bin
171+
172+vexpress_uefi_backup_path = SOFTWARE/A9/backup-uefi.bin
173+
174+vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD
175+
176+read_boot_cmds_from_image = 0
177
178=== added file 'lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2-benchmark.conf'
179--- lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2-benchmark.conf 1970-01-01 00:00:00 +0000
180+++ lava_dispatcher/default-config/lava-dispatcher/device-types/vexpress-tc2-benchmark.conf 2013-07-31 11:19:27 +0000
181@@ -0,0 +1,36 @@
182+client_type = vexpress
183+
184+boot_cmds = 2
185+
186+boot_cmds_android = 3
187+
188+interrupt_boot_prompt = The default boot selection will start in
189+
190+bootloader_prompt = Start:
191+
192+image_boot_msg = Booting Linux
193+
194+lmc_dev_arg = vexpress
195+
196+possible_partitions_files =
197+ init.partitions.rc
198+ fstab.partitions
199+ init.rc
200+ fstab.arm-versatileexpress
201+
202+uefi_image_filename = uefi_v2p-ca15-tc2.bin
203+
204+vexpress_uefi_path = SOFTWARE/TC2/uefi.bin
205+
206+vexpress_uefi_backup_path = SOFTWARE/TC2/backup-uefi.bin
207+
208+vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD
209+
210+read_boot_cmds_from_image = 0
211+
212+android_orig_block_device = mmcblk0
213+android_lava_block_device = sda
214+partition_padding_string_android =
215+sys_part_android = 1
216+sdcard_part_android = 3
217+data_part_android = 2

Subscribers

People subscribed via source and target branches