Merge lp:~le-chi-thu/lava-dispatcher/snowball_support into lp:lava-dispatcher

Proposed by Le Chi Thu
Status: Merged
Merged at revision: 175
Proposed branch: lp:~le-chi-thu/lava-dispatcher/snowball_support
Merge into: lp:lava-dispatcher
Diff against target: 36 lines (+8/-9)
2 files modified
lava_dispatcher/connection.py (+1/-8)
lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf (+7/-1)
To merge this branch: bzr merge lp:~le-chi-thu/lava-dispatcher/snowball_support
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle (community) Approve
Review via email: mp+84674@code.launchpad.net

Description of the change

Add support for snowball V5 and later. PS remember to have a loop of cu and do the retry to restart the cu.

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Well that looks simple enough. If it works, land it :-)

Do we have docs on how to set up conmux/cu so that it works for snowball?

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/connection.py'
2--- lava_dispatcher/connection.py 2011-11-21 23:06:03 +0000
3+++ lava_dispatcher/connection.py 2011-12-06 21:08:25 +0000
4@@ -90,14 +90,7 @@
5 logging.info("Perform hard reset on the system")
6 self.proc.send("~$")
7 self.proc.sendline("hardreset")
8- # XXX Workaround for snowball
9- if self.device_option('device_type') == "snowball_sd":
10- time.sleep(10)
11- self.in_master_shell(300)
12- # Intentionally avoid self.soft_reboot() to prevent looping
13- self.proc.sendline("reboot")
14- self.enter_uboot()
15-
16+
17 def _boot(self, boot_cmds):
18 self.soft_reboot()
19 try:
20
21=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf'
22--- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2011-10-20 04:09:15 +0000
23+++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf 2011-12-06 21:08:25 +0000
24@@ -9,5 +9,11 @@
25 hwmem=48M@302M mem=152M@360M'",
26 boot
27
28-#boot_cmds_android = TBD
29+boot_cmds_android = mmc init,
30+ mmc rescan 1,
31+ setenv initrd_high "'0xffffffff'",
32+ setenv fdt_high "'0xffffffff'",
33+ setenv bootcmd "'fat load mmc 1:3 0x00100000 /uImage; fat load mmc 1:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
34+ setenv bootargs "'console=ttyAMA2,115200n8 root=/dev/mmcblk1p5 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=256M init=/init androidboot.console=ttyAMA2 omapdss.def_disp=hdmi consoleblank=0'",
35+ boot
36 bootloader_prompt = $

Subscribers

People subscribed via source and target branches