Merge lp:~dpigott/lava-lab/make-lava-lab-have-all-device-configs into lp:lava-lab
- make-lava-lab-have-all-device-configs
- Merge into salt-states
Status: | Needs review |
---|---|
Proposed branch: | lp:~dpigott/lava-lab/make-lava-lab-have-all-device-configs |
Merge into: | lp:lava-lab |
Diff against target: |
815 lines (+725/-0) 18 files modified
lava/device-types/beagle-xm.conf (+23/-0) lava/device-types/beaglebone-black.conf (+21/-0) lava/device-types/beaglebone.conf (+21/-0) lava/device-types/capri.conf (+46/-0) lava/device-types/highbank.conf (+2/-0) lava/device-types/k3v2.conf (+46/-0) lava/device-types/kvm.conf (+3/-0) lava/device-types/mx51evk.conf (+11/-0) lava/device-types/mx53loco.conf (+30/-0) lava/device-types/nexus.conf (+46/-0) lava/device-types/nexus10.conf (+46/-0) lava/device-types/qemu.conf (+7/-0) lava/device-types/rtsm_foundation-armv8.conf (+20/-0) lava/device-types/rtsm_ve-a15x1-a7x1.conf (+111/-0) lava/device-types/rtsm_ve-a15x4-a7x4.conf (+111/-0) lava/device-types/rtsm_ve-armv8.conf (+128/-0) lava/device-types/vexpress-tc2.conf (+36/-0) lava/device-types/vexpress.conf (+17/-0) |
To merge this branch: | bzr merge lp:~dpigott/lava-lab/make-lava-lab-have-all-device-configs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Linaro Validation Team | Pending | ||
Review via email: mp+171788@code.launchpad.net |
Commit message
Description of the change
ok - so we have device-type configs in two places - the dispatcher and lava-lab, and any values in lava-lab override ones in dispatcher. What I've done is to make sure that lava-lab is up to date, taking care not to override any existing configs.
It strikes me that we have another problem to solve: Having device configs in two places, which are out of step. lava-lab needs to hold the current set, and any changes to it need to be reflected back into the dispatcher. The reason we need lava-lab to be definitive is that means we can re-salt to update a device type, rather than having to deploy a potentially unstable dispatcher.
I'm not self approving this, because it needs discussion, but it's already resulted in a fastmodels device failing because its dispatcher was wound back too far and the dispatcher didn't have the config for it and neither did lava-lab.
Unmerged revisions
- 200. By Dave Pigott
-
Update to latest
- 199. By Dave Pigott
-
Make lava-lab the definitive device-type list
Preview Diff
1 | === added file 'lava/device-types/beagle-xm.conf' |
2 | --- lava/device-types/beagle-xm.conf 1970-01-01 00:00:00 +0000 |
3 | +++ lava/device-types/beagle-xm.conf 2013-06-27 12:23:26 +0000 |
4 | @@ -0,0 +1,23 @@ |
5 | +boot_cmds = mmc init, |
6 | + mmc part 0, |
7 | + setenv bootcmd "'fatload mmc 0:3 0x80000000 uImage; |
8 | + fatload mmc 0:3 0x81600000 uInitrd; |
9 | + bootm 0x80000000 0x81600000'", |
10 | + setenv bootargs "' console=tty0 console=ttyO2,115200n8 |
11 | + root=LABEL=testrootfs rootwait ro earlyprintk fixrtc nocompcache |
12 | + vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60'", |
13 | + boot |
14 | + |
15 | +boot_cmds_android = mmc init, |
16 | + mmc part 0, |
17 | + setenv bootcmd "'fatload mmc 0:3 0x80000000 uImage; |
18 | + fatload mmc 0:3 0x81600000 uInitrd; |
19 | + bootm 0x80000000 0x81600000'", |
20 | + setenv bootargs "'console=tty0 console=ttyO2,115200n8 |
21 | + rootwait rw earlyprintk fixrtc nocompcache |
22 | + vram=12M omapfb.debug=y omapfb.mode=dvi:1280x720MR-16@60 |
23 | + init=/init androidboot.console=ttyO2'", |
24 | + boot |
25 | + |
26 | +qemu_machine_type = beaglexm |
27 | +lmc_dev_arg = beagle |
28 | |
29 | === added file 'lava/device-types/beaglebone-black.conf' |
30 | --- lava/device-types/beaglebone-black.conf 1970-01-01 00:00:00 +0000 |
31 | +++ lava/device-types/beaglebone-black.conf 2013-06-27 12:23:26 +0000 |
32 | @@ -0,0 +1,21 @@ |
33 | +boot_cmds_oe = |
34 | + setenv initrd_high "'0xffffffff'", |
35 | + setenv fdt_high "'0xffffffff'", |
36 | + setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x815f0000 board.dtb; bootm 0x80200000 - 0x815f0000'", |
37 | + setenv bootargs "'console=ttyO0,115200n8 root=/dev/mmcblk0p5 rootwait ro'", |
38 | + boot |
39 | + |
40 | +boot_cmds = |
41 | + setenv initrd_high "'0xffffffff'", |
42 | + setenv fdt_high "'0xffffffff'", |
43 | + setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x81600000 uInitrd; fatload mmc 0:3 0x815f0000 board.dtb; bootm 0x80200000 0x81600000 0x815f0000'", |
44 | + setenv bootargs "'console=ttyO0,115200n8 root=LABEL=testrootfs rootwait ro'", |
45 | + boot |
46 | + |
47 | +lmc_dev_arg = beaglebone |
48 | + |
49 | +boot_options = |
50 | + boot_cmds |
51 | + |
52 | +[boot_cmds] |
53 | +default = boot_cmds |
54 | |
55 | === added file 'lava/device-types/beaglebone.conf' |
56 | --- lava/device-types/beaglebone.conf 1970-01-01 00:00:00 +0000 |
57 | +++ lava/device-types/beaglebone.conf 2013-06-27 12:23:26 +0000 |
58 | @@ -0,0 +1,21 @@ |
59 | +boot_cmds_oe = |
60 | + setenv initrd_high "'0xffffffff'", |
61 | + setenv fdt_high "'0xffffffff'", |
62 | + setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x815f0000 board.dtb; bootm 0x80200000 - 0x815f0000'", |
63 | + setenv bootargs "'console=ttyO0,115200n8 root=/dev/mmcblk0p5 rootwait ro'", |
64 | + boot |
65 | + |
66 | +boot_cmds = |
67 | + setenv initrd_high "'0xffffffff'", |
68 | + setenv fdt_high "'0xffffffff'", |
69 | + setenv bootcmd "'fatload mmc 0:3 0x80200000 uImage; fatload mmc 0:3 0x81600000 uInitrd; fatload mmc 0:3 0x815f0000 board.dtb; bootm 0x80200000 0x81600000 0x815f0000'", |
70 | + setenv bootargs "'console=ttyO0,115200n8 root=LABEL=testrootfs rootwait ro'", |
71 | + boot |
72 | + |
73 | +lmc_dev_arg = beaglebone |
74 | + |
75 | +boot_options = |
76 | + boot_cmds |
77 | + |
78 | +[boot_cmds] |
79 | +default = boot_cmds |
80 | |
81 | === added file 'lava/device-types/capri.conf' |
82 | --- lava/device-types/capri.conf 1970-01-01 00:00:00 +0000 |
83 | +++ lava/device-types/capri.conf 2013-06-27 12:23:26 +0000 |
84 | @@ -0,0 +1,46 @@ |
85 | +client_type = capri |
86 | + |
87 | +# The ADB command line. |
88 | +# |
89 | +# In the case where there are multiple android devices plugged into a |
90 | +# single host, this connection command must be overriden on each device to |
91 | +# include the serial number of the device, e.g. |
92 | +# |
93 | +# serial_number = XXXXXXXXXXXXXXXX |
94 | +# adb_command = adb -s %(serial_number)s |
95 | +adb_command = adb |
96 | + |
97 | +# The fastboot command. |
98 | +# |
99 | +# The same as above: if you have more than one device, you will want to |
100 | +# override this in your device config to add a serial number, e.g. |
101 | +# |
102 | +# serial_number = XXXXXXXXXXXXXXXX |
103 | +# fastboot_command = fastboot -s %(serial_number)s |
104 | +# |
105 | +# Of course, in the case you override both adb_command *and* fastboot_command, |
106 | +# you don't need to specify `serial_number` twice. |
107 | +fastboot_command = fastboot |
108 | + |
109 | +# Working directory for temporary files. By default, the usual place for LAVA |
110 | +# images will be used. |
111 | +# |
112 | +# This is useful when the lava dispatcher is controlling the device under test which is |
113 | +# physically plugged to other machines by setting adb_command to something like |
114 | +# "ssh <phone-host> adb" and fastboot_command to something like "ssh |
115 | +# <phone-host> fastboot". adb and fastboot always operate on local files, so |
116 | +# you need your local files to also be seen as local files on the host where |
117 | +# adb/fastboot are executed. |
118 | +# |
119 | +# In this case, you should set shared_working_directory to a shared directory |
120 | +# between the machine running the dispatcher and the machine where the phone is |
121 | +# plugged. This shared directory must have the same path in both machines. |
122 | +# For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at |
123 | +# <phone-host> (or the other way around). |
124 | +shared_working_directory = |
125 | + |
126 | +connection_command = %(adb_command)s shell |
127 | + |
128 | +enable_network_after_boot_android = false |
129 | +android_adb_over_usb = true |
130 | +android_adb_over_tcp = false |
131 | |
132 | === added file 'lava/device-types/highbank.conf' |
133 | --- lava/device-types/highbank.conf 1970-01-01 00:00:00 +0000 |
134 | +++ lava/device-types/highbank.conf 2013-06-27 12:23:26 +0000 |
135 | @@ -0,0 +1,2 @@ |
136 | +client_type = highbank |
137 | +connection_command = ipmitool -I lanplus -U admin -P admin -H %(ecmeip)s sol activate |
138 | |
139 | === added file 'lava/device-types/k3v2.conf' |
140 | --- lava/device-types/k3v2.conf 1970-01-01 00:00:00 +0000 |
141 | +++ lava/device-types/k3v2.conf 2013-06-27 12:23:26 +0000 |
142 | @@ -0,0 +1,46 @@ |
143 | +client_type = k3v2 |
144 | + |
145 | +# The ADB command line. |
146 | +# |
147 | +# In the case where there are multiple android devices plugged into a |
148 | +# single host, this connection command must be overriden on each device to |
149 | +# include the serial number of the device, e.g. |
150 | +# |
151 | +# serial_number = XXXXXXXXXXXXXXXX |
152 | +# adb_command = adb -s %(serial_number)s |
153 | +adb_command = adb |
154 | + |
155 | +# The fastboot command. |
156 | +# |
157 | +# The same as above: if you have more than one device, you will want to |
158 | +# override this in your device config to add a serial number, e.g. |
159 | +# |
160 | +# serial_number = XXXXXXXXXXXXXXXX |
161 | +# fastboot_command = fastboot -s %(serial_number)s |
162 | +# |
163 | +# Of course, in the case you override both adb_command *and* fastboot_command, |
164 | +# you don't need to specify `serial_number` twice. |
165 | +fastboot_command = fastboot |
166 | + |
167 | +# Working directory for temporary files. By default, the usual place for LAVA |
168 | +# images will be used. |
169 | +# |
170 | +# This is useful when the lava dispatcher is controlling the device under test which is |
171 | +# physically plugged to other machines by setting adb_command to something like |
172 | +# "ssh <phone-host> adb" and fastboot_command to something like "ssh |
173 | +# <phone-host> fastboot". adb and fastboot always operate on local files, so |
174 | +# you need your local files to also be seen as local files on the host where |
175 | +# adb/fastboot are executed. |
176 | +# |
177 | +# In this case, you should set shared_working_directory to a shared directory |
178 | +# between the machine running the dispatcher and the machine where the phone is |
179 | +# plugged. This shared directory must have the same path in both machines. |
180 | +# For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at |
181 | +# <phone-host> (or the other way around). |
182 | +shared_working_directory = |
183 | + |
184 | +connection_command = %(adb_command)s shell |
185 | + |
186 | +enable_network_after_boot_android = false |
187 | +android_adb_over_usb = true |
188 | +android_adb_over_tcp = false |
189 | |
190 | === added file 'lava/device-types/kvm.conf' |
191 | --- lava/device-types/kvm.conf 1970-01-01 00:00:00 +0000 |
192 | +++ lava/device-types/kvm.conf 2013-06-27 12:23:26 +0000 |
193 | @@ -0,0 +1,3 @@ |
194 | +client_type = qemu |
195 | +qemu_binary = qemu-system-x86_64 |
196 | +qemu_options = -machine accel=kvm:tcg -hda {DISK_IMAGE} -nographic |
197 | |
198 | === added file 'lava/device-types/mx51evk.conf' |
199 | --- lava/device-types/mx51evk.conf 1970-01-01 00:00:00 +0000 |
200 | +++ lava/device-types/mx51evk.conf 2013-06-27 12:23:26 +0000 |
201 | @@ -0,0 +1,11 @@ |
202 | +boot_part = 2 |
203 | +root_part = 3 |
204 | +boot_cmds = mmc init, |
205 | + mmc part 0, |
206 | + setenv bootcmd "'fatload mmc 0:5 0x90000000 uImage; fatload mmc 0:5 |
207 | + 0x92000000 uInitrd; fatload mmc 0:5 0x91ff0000 board.dtb; bootm |
208 | + 0x90000000 0x92000000 0x91ff0000'", |
209 | + setenv bootargs "' console=tty0 console=ttymxc0,115200n8 |
210 | + root=LABEL=testrootfs rootwait ro'", |
211 | + boot |
212 | +bootloader_prompt = > |
213 | |
214 | === added file 'lava/device-types/mx53loco.conf' |
215 | --- lava/device-types/mx53loco.conf 1970-01-01 00:00:00 +0000 |
216 | +++ lava/device-types/mx53loco.conf 2013-06-27 12:23:26 +0000 |
217 | @@ -0,0 +1,30 @@ |
218 | +boot_part = 2 |
219 | +root_part = 3 |
220 | +boot_cmds = mmc init, |
221 | + mmc part 0, |
222 | + setenv bootcmd "'fatload mmc 0:5 0x70800000 uImage; fatload mmc |
223 | + 0:5 0x71800000 uInitrd; bootm 0x70800000 0x71800000'", |
224 | + setenv bootargs "' console=tty0 console=ttymxc0,115200n8 |
225 | + root=LABEL=testrootfs rootwait ro'", |
226 | + boot |
227 | + |
228 | +# Original linaro-android-media-create generated Android system SD card layout |
229 | +boot_part_android_org = 2 |
230 | +sys_part_android_org = 3 |
231 | +cache_part_android_org = 5 |
232 | +data_part_android_org = 6 |
233 | +sdcard_part_android_org = 7 |
234 | + |
235 | +# Android LAVA test image SD card layout |
236 | +sys_part_android = 6 |
237 | +sdcard_part_android = 7 |
238 | +data_part_android = 7 |
239 | +boot_cmds_android = mmc init, |
240 | + mmc part 0, |
241 | + setenv bootcmd "'fatload mmc 0:5 0x70000000 uImage; |
242 | + fatload mmc 0:5 0x72000000 uInitrd; bootm 0x70000000 0x72000000'", |
243 | + setenv bootargs "'console=tty0 console=ttymxc0,115200n8 |
244 | + rootwait ro earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve |
245 | + init=/init androidboot.console=ttymxc0'", |
246 | + boot |
247 | +bootloader_prompt = > |
248 | |
249 | === added file 'lava/device-types/nexus.conf' |
250 | --- lava/device-types/nexus.conf 1970-01-01 00:00:00 +0000 |
251 | +++ lava/device-types/nexus.conf 2013-06-27 12:23:26 +0000 |
252 | @@ -0,0 +1,46 @@ |
253 | +client_type = fastboot |
254 | + |
255 | +# The ADB command line. |
256 | +# |
257 | +# In the case where there are multiple android devices plugged into a |
258 | +# single host, this connection command must be overriden on each device to |
259 | +# include the serial number of the device, e.g. |
260 | +# |
261 | +# serial_number = XXXXXXXXXXXXXXXX |
262 | +# adb_command = adb -s %(serial_number)s |
263 | +adb_command = adb |
264 | + |
265 | +# The fastboot command. |
266 | +# |
267 | +# The same as above: if you have more than one device, you will want to |
268 | +# override this in your device config to add a serial number, e.g. |
269 | +# |
270 | +# serial_number = XXXXXXXXXXXXXXXX |
271 | +# fastboot_command = fastboot -s %(serial_number)s |
272 | +# |
273 | +# Of course, in the case you override both adb_command *and* fastboot_command, |
274 | +# you don't need to specify `serial_number` twice. |
275 | +fastboot_command = fastboot |
276 | + |
277 | +# Working directory for temporary files. By default, the usual place for LAVA |
278 | +# images will be used. |
279 | +# |
280 | +# This is useful when the lava dispatcher is controlling the device under test which is |
281 | +# physically plugged to other machines by setting adb_command to something like |
282 | +# "ssh <phone-host> adb" and fastboot_command to something like "ssh |
283 | +# <phone-host> fastboot". adb and fastboot always operate on local files, so |
284 | +# you need your local files to also be seen as local files on the host where |
285 | +# adb/fastboot are executed. |
286 | +# |
287 | +# In this case, you should set shared_working_directory to a shared directory |
288 | +# between the machine running the dispatcher and the machine where the phone is |
289 | +# plugged. This shared directory must have the same path in both machines. |
290 | +# For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at |
291 | +# <phone-host> (or the other way around). |
292 | +shared_working_directory = |
293 | + |
294 | +connection_command = %(adb_command)s shell |
295 | + |
296 | +enable_network_after_boot_android = false |
297 | +android_adb_over_usb = true |
298 | +android_adb_over_tcp = false |
299 | |
300 | === added file 'lava/device-types/nexus10.conf' |
301 | --- lava/device-types/nexus10.conf 1970-01-01 00:00:00 +0000 |
302 | +++ lava/device-types/nexus10.conf 2013-06-27 12:23:26 +0000 |
303 | @@ -0,0 +1,46 @@ |
304 | +client_type = nexus10 |
305 | + |
306 | +# The ADB command line. |
307 | +# |
308 | +# In the case where there are multiple android devices plugged into a |
309 | +# single host, this connection command must be overriden on each device to |
310 | +# include the serial number of the device, e.g. |
311 | +# |
312 | +# serial_number = XXXXXXXXXXXXXXXX |
313 | +# adb_command = adb -s %(serial_number)s |
314 | +adb_command = adb |
315 | + |
316 | +# The fastboot command. |
317 | +# |
318 | +# The same as above: if you have more than one device, you will want to |
319 | +# override this in your device config to add a serial number, e.g. |
320 | +# |
321 | +# serial_number = XXXXXXXXXXXXXXXX |
322 | +# fastboot_command = fastboot -s %(serial_number)s |
323 | +# |
324 | +# Of course, in the case you override both adb_command *and* fastboot_command, |
325 | +# you don't need to specify `serial_number` twice. |
326 | +fastboot_command = fastboot |
327 | + |
328 | +# Working directory for temporary files. By default, the usual place for LAVA |
329 | +# images will be used. |
330 | +# |
331 | +# This is useful when the lava dispatcher is controlling the device under test which is |
332 | +# physically plugged to other machines by setting adb_command to something like |
333 | +# "ssh <phone-host> adb" and fastboot_command to something like "ssh |
334 | +# <phone-host> fastboot". adb and fastboot always operate on local files, so |
335 | +# you need your local files to also be seen as local files on the host where |
336 | +# adb/fastboot are executed. |
337 | +# |
338 | +# In this case, you should set shared_working_directory to a shared directory |
339 | +# between the machine running the dispatcher and the machine where the phone is |
340 | +# plugged. This shared directory must have the same path in both machines. |
341 | +# For example, you can have your /var/tmp/lava mounted at /var/tmp/lava at |
342 | +# <phone-host> (or the other way around). |
343 | +shared_working_directory = |
344 | + |
345 | +connection_command = %(adb_command)s shell |
346 | + |
347 | +enable_network_after_boot_android = false |
348 | +android_adb_over_usb = true |
349 | +android_adb_over_tcp = false |
350 | |
351 | === added file 'lava/device-types/qemu.conf' |
352 | --- lava/device-types/qemu.conf 1970-01-01 00:00:00 +0000 |
353 | +++ lava/device-types/qemu.conf 2013-06-27 12:23:26 +0000 |
354 | @@ -0,0 +1,7 @@ |
355 | +client_type=qemu |
356 | + |
357 | +qemu_binary = qemu-system-arm |
358 | +qemu_options = -M %(qemu_machine_type)s -drive if=%(qemu_drive_interface)s,cache=writeback,file={DISK_IMAGE} -clock unix -device usb-kbd -device usb-mouse -usb -device usb-net,netdev=mynet -netdev user,id=mynet -net nic -net user -nographic |
359 | + |
360 | +qemu_machine_type = beaglexm |
361 | +qemu_drive_interface = sd |
362 | |
363 | === added file 'lava/device-types/rtsm_foundation-armv8.conf' |
364 | --- lava/device-types/rtsm_foundation-armv8.conf 1970-01-01 00:00:00 +0000 |
365 | +++ lava/device-types/rtsm_foundation-armv8.conf 2013-06-27 12:23:26 +0000 |
366 | @@ -0,0 +1,20 @@ |
367 | +client_type=fastmodel |
368 | + |
369 | +# how long the disablesuspend script should take to complete |
370 | +# fm takes longer than other android images do |
371 | +disablesuspend_timeout = 500 |
372 | + |
373 | +# how long ubuntu takes to boot to prompt |
374 | +boot_linaro_timeout = 500 |
375 | + |
376 | +# if you do dhcp on boot, adb will not work (asac) on fastmodels |
377 | +enable_network_after_boot_android = 0 |
378 | + |
379 | +# we do usermode networking over the loopback |
380 | +default_network_interface = lo |
381 | + |
382 | +simulator_axf_files = img-foundation.axf |
383 | + |
384 | +simulator_version_command = /opt/arm/Foundation_v8pkg/Foundation_v8 --version | grep "ARM V8 Foundation Model" | sed 's/ARM V8 Foundation Model //' |
385 | + |
386 | +simulator_command = sudo -u www-data /opt/arm/Foundation_v8pkg/Foundation_v8 --image={AXF} --block-device={IMG} --network=nat |
387 | |
388 | === added file 'lava/device-types/rtsm_ve-a15x1-a7x1.conf' |
389 | --- lava/device-types/rtsm_ve-a15x1-a7x1.conf 1970-01-01 00:00:00 +0000 |
390 | +++ lava/device-types/rtsm_ve-a15x1-a7x1.conf 2013-06-27 12:23:26 +0000 |
391 | @@ -0,0 +1,111 @@ |
392 | +client_type=fastmodel |
393 | + |
394 | +# how long the disablesuspend script should take to complete |
395 | +# fm takes longer than other android images do |
396 | +disablesuspend_timeout = 500 |
397 | + |
398 | +# how long ubuntu takes to boot to prompt |
399 | +boot_linaro_timeout = 800 |
400 | + |
401 | +# if you do dhcp on boot, adb will not work (asac) on fastmodels |
402 | +enable_network_after_boot_android = 0 |
403 | + |
404 | +# we do usermode networking over the loopback |
405 | +default_network_interface = lo |
406 | + |
407 | +bootloader_prompt = Start: |
408 | + |
409 | +interrupt_boot_prompt = The default boot selection will start in |
410 | + |
411 | +interrupt_boot_command = break |
412 | + |
413 | +# UEFI boot commands |
414 | +boot_cmds = sendline a, |
415 | + expect Choice:, |
416 | + sendline 1, |
417 | + expect Select the Boot Device:, |
418 | + sendline 2, |
419 | + expect File path of the EFI Application or the kernel:, |
420 | + sendline uImage, |
421 | + expect [a/g/l], |
422 | + sendline l, |
423 | + expect Add an initrd: [y/n], |
424 | + sendline y, |
425 | + expect File path of the initrd:, |
426 | + sendline uInitrd, |
427 | + expect Arguments to pass to the binary:, |
428 | + sendline 'console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M', |
429 | + expect File path of the local FDT:, |
430 | + sendline rtsm\\rtsm_ve-ca15x1-ca7x1.dtb, |
431 | + expect Description for this new Entry:, |
432 | + sendline Test Image, |
433 | + expect Choice:, |
434 | + sendline 5, |
435 | + expect Start:, |
436 | + sendline 2 |
437 | + |
438 | +simulator_axf_files = |
439 | + img.axf |
440 | + linux-system-ISW.axf |
441 | + rtsm/linux-system-semi.axf |
442 | + |
443 | +simulator_kernel = vmlinuz.* |
444 | +simulator_initrd = initrd.* |
445 | +simulator_dtb = rtsm_ve-ca15x1-ca7x1.dtb |
446 | +simulator_uefi = uefi_rtsm_ve-ca15.bin |
447 | + |
448 | +license_file = 8224@localhost |
449 | +sim_bin = /opt/arm/RTSM_A15-A7x14_VE/Linux64_RTSM_VE_Cortex-A15x4-A7x4/RTSM_VE_Cortex-A15x4-A7x4 |
450 | +android_adb_port = 6555 |
451 | + |
452 | +simulator_version_command = %(sim_bin)s --version | grep "Fast Models" | sed 's/Fast Models \[//' | sed 's/\]//' |
453 | + |
454 | +simulator_boot_wrapper = -a coretile.cluster0.*={AXF} |
455 | + |
456 | +simulator_command = sudo -u www-data ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s |
457 | + |
458 | +boot_options = |
459 | + motherboard.mmc.p_mmc_file |
460 | + motherboard.hostbridge.userNetPorts |
461 | + motherboard.smsc_91c111.enabled |
462 | + motherboard.hostbridge.userNetworking |
463 | + motherboard.flashloader0.fname |
464 | + motherboard.flashloader1.fname |
465 | + motherboard.flashloader1.fnameWrite |
466 | + coretile.cache_state_modelled |
467 | + coretile.cluster0.cpu0.semihosting-enable |
468 | + coretile.cluster0.cpu0.semihosting-cmd_line |
469 | + |
470 | +[motherboard.mmc.p_mmc_file] |
471 | +default = {IMG} |
472 | + |
473 | +[motherboard.hostbridge.userNetPorts] |
474 | +default="%(android_adb_port)s=%(android_adb_port)s" |
475 | + |
476 | +[motherboard.smsc_91c111.enabled] |
477 | +default = 1 |
478 | +allowed = 0,1 |
479 | + |
480 | +[motherboard.hostbridge.userNetworking] |
481 | +default = 1 |
482 | +allowed = 0,1 |
483 | + |
484 | +[motherboard.flashloader0.fname] |
485 | +default = {UEFI} |
486 | + |
487 | +[motherboard.flashloader1.fname] |
488 | +default = uefi-vars.fd |
489 | + |
490 | +[motherboard.flashloader1.fnameWrite] |
491 | +default = uefi-vars.fd |
492 | + |
493 | +[coretile.cache_state_modelled] |
494 | +default = 0 |
495 | +allowed = 0,1 |
496 | + |
497 | +[coretile.cluster0.cpu0.semihosting-enable] |
498 | +default = 1 |
499 | +allowed = 0,1 |
500 | + |
501 | +[coretile.cluster0.cpu0.semihosting-cmd_line] |
502 | +default = "--kernel {KERNEL} --dtb {DTB} --initrd {INITRD} -- console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M" |
503 | |
504 | === added file 'lava/device-types/rtsm_ve-a15x4-a7x4.conf' |
505 | --- lava/device-types/rtsm_ve-a15x4-a7x4.conf 1970-01-01 00:00:00 +0000 |
506 | +++ lava/device-types/rtsm_ve-a15x4-a7x4.conf 2013-06-27 12:23:26 +0000 |
507 | @@ -0,0 +1,111 @@ |
508 | +client_type=fastmodel |
509 | + |
510 | +# how long the disablesuspend script should take to complete |
511 | +# fm takes longer than other android images do |
512 | +disablesuspend_timeout = 500 |
513 | + |
514 | +# how long ubuntu takes to boot to prompt |
515 | +boot_linaro_timeout = 800 |
516 | + |
517 | +# if you do dhcp on boot, adb will not work (asac) on fastmodels |
518 | +enable_network_after_boot_android = 0 |
519 | + |
520 | +# we do usermode networking over the loopback |
521 | +default_network_interface = lo |
522 | + |
523 | +bootloader_prompt = Start: |
524 | + |
525 | +interrupt_boot_prompt = The default boot selection will start in |
526 | + |
527 | +interrupt_boot_command = break |
528 | + |
529 | +# UEFI boot commands |
530 | +boot_cmds = sendline a, |
531 | + expect Choice:, |
532 | + sendline 1, |
533 | + expect Select the Boot Device:, |
534 | + sendline 2, |
535 | + expect File path of the EFI Application or the kernel:, |
536 | + sendline uImage, |
537 | + expect [a/g/l], |
538 | + sendline l, |
539 | + expect Add an initrd: [y/n], |
540 | + sendline y, |
541 | + expect File path of the initrd:, |
542 | + sendline uInitrd, |
543 | + expect Arguments to pass to the binary:, |
544 | + sendline 'console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M', |
545 | + expect File path of the local FDT:, |
546 | + sendline rtsm\\rtsm_ve-ca15x4-ca7x4.dtb, |
547 | + expect Description for this new Entry:, |
548 | + sendline Test Image, |
549 | + expect Choice:, |
550 | + sendline 5, |
551 | + expect Start:, |
552 | + sendline 2 |
553 | + |
554 | +simulator_axf_files = |
555 | + img.axf |
556 | + linux-system-ISW.axf |
557 | + rtsm/linux-system-semi.axf |
558 | + |
559 | +simulator_kernel = vmlinuz.* |
560 | +simulator_initrd = initrd.* |
561 | +simulator_dtb = rtsm_ve-ca15x4-ca7x4.dtb |
562 | +simulator_uefi = uefi_rtsm_ve-ca15.bin |
563 | + |
564 | +license_file = 8224@localhost |
565 | +sim_bin = /opt/arm/RTSM_A15-A7x14_VE/Linux64_RTSM_VE_Cortex-A15x4-A7x4/RTSM_VE_Cortex-A15x4-A7x4 |
566 | +android_adb_port = 6555 |
567 | + |
568 | +simulator_version_command = %(sim_bin)s --version | grep "Fast Models" | sed 's/Fast Models \[//' | sed 's/\]//' |
569 | + |
570 | +simulator_boot_wrapper = -a coretile.cluster0.*={AXF} |
571 | + |
572 | +simulator_command = sudo -u www-data ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s |
573 | + |
574 | +boot_options = |
575 | + motherboard.mmc.p_mmc_file |
576 | + motherboard.hostbridge.userNetPorts |
577 | + motherboard.smsc_91c111.enabled |
578 | + motherboard.hostbridge.userNetworking |
579 | + motherboard.flashloader0.fname |
580 | + motherboard.flashloader1.fname |
581 | + motherboard.flashloader1.fnameWrite |
582 | + coretile.cache_state_modelled |
583 | + coretile.cluster0.cpu0.semihosting-enable |
584 | + coretile.cluster0.cpu0.semihosting-cmd_line |
585 | + |
586 | +[motherboard.mmc.p_mmc_file] |
587 | +default = {IMG} |
588 | + |
589 | +[motherboard.hostbridge.userNetPorts] |
590 | +default="%(android_adb_port)s=%(android_adb_port)s" |
591 | + |
592 | +[motherboard.smsc_91c111.enabled] |
593 | +default = 1 |
594 | +allowed = 0,1 |
595 | + |
596 | +[motherboard.hostbridge.userNetworking] |
597 | +default = 1 |
598 | +allowed = 0,1 |
599 | + |
600 | +[motherboard.flashloader0.fname] |
601 | +default = {UEFI} |
602 | + |
603 | +[motherboard.flashloader1.fname] |
604 | +default = uefi-vars.fd |
605 | + |
606 | +[motherboard.flashloader1.fnameWrite] |
607 | +default = uefi-vars.fd |
608 | + |
609 | +[coretile.cache_state_modelled] |
610 | +default = 0 |
611 | +allowed = 0,1 |
612 | + |
613 | +[coretile.cluster0.cpu0.semihosting-enable] |
614 | +default = 1 |
615 | +allowed = 0,1 |
616 | + |
617 | +[coretile.cluster0.cpu0.semihosting-cmd_line] |
618 | +default = "--kernel {KERNEL} --dtb {DTB} --initrd {INITRD} -- console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M" |
619 | |
620 | === added file 'lava/device-types/rtsm_ve-armv8.conf' |
621 | --- lava/device-types/rtsm_ve-armv8.conf 1970-01-01 00:00:00 +0000 |
622 | +++ lava/device-types/rtsm_ve-armv8.conf 2013-06-27 12:23:26 +0000 |
623 | @@ -0,0 +1,128 @@ |
624 | +client_type=fastmodel |
625 | + |
626 | +# how long the disablesuspend script should take to complete |
627 | +# fm takes longer than other android images do |
628 | +disablesuspend_timeout = 500 |
629 | + |
630 | +# how long ubuntu takes to boot to prompt |
631 | +boot_linaro_timeout = 500 |
632 | + |
633 | +#after enabled the network, we can set it to true |
634 | +enable_network_after_boot_android = 1 |
635 | + |
636 | +# change to use eth0 after we enabled the network |
637 | +default_network_interface = eth0 |
638 | + |
639 | +bootloader_prompt = Start: |
640 | + |
641 | +interrupt_boot_prompt = The default boot selection will start in |
642 | + |
643 | +interrupt_boot_command = break |
644 | + |
645 | +# UEFI boot commands |
646 | +boot_cmds = sendline a, |
647 | + expect Choice:, |
648 | + sendline 1, |
649 | + expect Select the Boot Device:, |
650 | + sendline 2, |
651 | + expect File path of the EFI Application or the kernel:, |
652 | + sendline uImage, |
653 | + expect [a/g/l], |
654 | + sendline l, |
655 | + expect Add an initrd: [y/n], |
656 | + sendline y, |
657 | + expect File path of the initrd:, |
658 | + sendline uInitrd, |
659 | + expect Arguments to pass to the binary:, |
660 | + sendline 'console=ttyAMA0,38400n8 root=/dev/mmcblk0p2 rootwait ro mem=1024M', |
661 | + expect File path of the local FDT:, |
662 | + sendline rtsm\\rtsm_ve-ca15x1-ca7x1.dtb, |
663 | + expect Description for this new Entry:, |
664 | + sendline Test Image, |
665 | + expect Choice:, |
666 | + sendline 5, |
667 | + expect Start:, |
668 | + sendline 2 |
669 | + |
670 | +simulator_axf_files = linux-system.axf |
671 | + |
672 | +license_file = 8224@localhost |
673 | +sim_bin = /opt/arm/RTSMv8_VE/bin/model_shell64 |
674 | +sim_model = /opt/arm/RTSMv8_VE/models/Linux64_GCC-4.1/RTSM_VE_AEMv8A.so |
675 | +android_adb_port = 5555 |
676 | +interfaceName = armv8_01 |
677 | + |
678 | +simulator_version_command = %(sim_bin)s --version | grep "Model Shell" | sed 's/Model Shell //' |
679 | + |
680 | +simulator_boot_wrapper = -a {AXF} |
681 | + |
682 | +simulator_command = sudo -u www-data ARMLMD_LICENSE_FILE="%(license_file)s" %(sim_bin)s %(sim_model)s |
683 | + |
684 | +boot_options = |
685 | + motherboard.mmc.p_mmc_file |
686 | + motherboard.smsc_91c111.enabled |
687 | + cluster.NUM_CORES |
688 | + cluster.cpu0.unpredictable_WPMASKANDBAS |
689 | + cluster.cpu0.unpredictable_non-contigous_BAS |
690 | + cluster.cpu1.unpredictable_WPMASKANDBAS |
691 | + cluster.cpu1.unpredictable_non-contigous_BAS |
692 | + cluster.cpu2.unpredictable_WPMASKANDBAS |
693 | + cluster.cpu2.unpredictable_non-contigous_BAS |
694 | + cluster.cpu3.unpredictable_WPMASKANDBAS |
695 | + cluster.cpu3.unpredictable_non-contigous_BAS |
696 | + cluster.take_ccfail_undef |
697 | + motherboard.hostbridge.interfaceName |
698 | + motherboard.smsc_91c111.mac_address |
699 | + |
700 | +[motherboard.smsc_91c111.mac_address] |
701 | +default="auto" |
702 | + |
703 | +[motherboard.hostbridge.interfaceName] |
704 | +default="%(interfaceName)s" |
705 | + |
706 | +[motherboard.mmc.p_mmc_file] |
707 | +default = {IMG} |
708 | + |
709 | +[motherboard.smsc_91c111.enabled] |
710 | +default = 1 |
711 | +allowed = 0,1 |
712 | + |
713 | +[cluster.NUM_CORES] |
714 | +default = 1 |
715 | +allowed = 0,1 |
716 | + |
717 | +[cluster.cpu0.unpredictable_WPMASKANDBAS] |
718 | +default = 0 |
719 | +allowed = 0,1 |
720 | + |
721 | +[cluster.cpu0.unpredictable_non-contigous_BAS] |
722 | +default = 0 |
723 | +allowed = 0,1 |
724 | + |
725 | +[cluster.cpu1.unpredictable_WPMASKANDBAS] |
726 | +default = 0 |
727 | +allowed = 0,1 |
728 | + |
729 | +[cluster.cpu1.unpredictable_non-contigous_BAS] |
730 | +default = 0 |
731 | +allowed = 0,1 |
732 | + |
733 | +[cluster.cpu2.unpredictable_WPMASKANDBAS] |
734 | +default = 0 |
735 | +allowed = 0,1 |
736 | + |
737 | +[cluster.cpu2.unpredictable_non-contigous_BAS] |
738 | +default = 0 |
739 | +allowed = 0,1 |
740 | + |
741 | +[cluster.cpu3.unpredictable_WPMASKANDBAS] |
742 | +default = 0 |
743 | +allowed = 0,1 |
744 | + |
745 | +[cluster.cpu3.unpredictable_non-contigous_BAS] |
746 | +default = 0 |
747 | +allowed = 0,1 |
748 | + |
749 | +[cluster.take_ccfail_undef] |
750 | +default = 0 |
751 | +allowed = 0,1 |
752 | |
753 | === added file 'lava/device-types/vexpress-tc2.conf' |
754 | --- lava/device-types/vexpress-tc2.conf 1970-01-01 00:00:00 +0000 |
755 | +++ lava/device-types/vexpress-tc2.conf 2013-06-27 12:23:26 +0000 |
756 | @@ -0,0 +1,36 @@ |
757 | +client_type = vexpress |
758 | + |
759 | +boot_cmds = 2 |
760 | + |
761 | +boot_cmds_android = 3 |
762 | + |
763 | +interrupt_boot_prompt = The default boot selection will start in |
764 | + |
765 | +bootloader_prompt = Start: |
766 | + |
767 | +image_boot_msg = Booting Linux |
768 | + |
769 | +lmc_dev_arg = vexpress |
770 | + |
771 | +possible_partitions_files = |
772 | + init.partitions.rc |
773 | + fstab.partitions |
774 | + init.rc |
775 | + fstab.arm-versatileexpress |
776 | + |
777 | +uefi_image_filename = uefi_v2p-ca15-tc2.bin |
778 | + |
779 | +vexpress_uefi_path = SOFTWARE/TC2/uefi.bin |
780 | + |
781 | +vexpress_uefi_backup_path = SOFTWARE/TC2/backup-uefi.bin |
782 | + |
783 | +vexpress_usb_mass_storage_device = /dev/disk/by-label/VEMSD |
784 | + |
785 | +read_boot_cmds_from_image = 0 |
786 | + |
787 | +android_orig_block_device = mmcblk0 |
788 | +android_lava_block_device = sda |
789 | +partition_padding_string_android = |
790 | +sys_part_android = 1 |
791 | +sdcard_part_android = 3 |
792 | +data_part_android = 2 |
793 | \ No newline at end of file |
794 | |
795 | === added file 'lava/device-types/vexpress.conf' |
796 | --- lava/device-types/vexpress.conf 1970-01-01 00:00:00 +0000 |
797 | +++ lava/device-types/vexpress.conf 2013-06-27 12:23:26 +0000 |
798 | @@ -0,0 +1,17 @@ |
799 | +boot_cmds = 2 |
800 | + |
801 | +boot_cmds_android = 3 |
802 | + |
803 | +interrupt_boot_prompt = The default boot selection will start in |
804 | + |
805 | +bootloader_prompt = Start: |
806 | + |
807 | +image_boot_msg = Booting Linux |
808 | + |
809 | +possible_partitions_files = |
810 | + init.partitions.rc |
811 | + fstab.partitions |
812 | + init.rc |
813 | + fstab.arm-versatileexpress |
814 | + |
815 | +read_boot_cmds_from_image = 0 |