diff mbox

[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 175: Added support for snowball V5 and later (Le Chi Thu)

Message ID 20111207015119.5282.51454.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Michael-Doyle Hudson Dec. 7, 2011, 1:51 a.m. UTC 
Merge authors:
  Le Chi Thu le.chi.thu@linaro.org <le.chi.thu@linaro.org>
Related merge proposals:
  https://code.launchpad.net/~le-chi-thu/lava-dispatcher/snowball_support/+merge/84674
  proposed by: Le Chi Thu (le-chi-thu)
  review: Approve - Michael Hudson-Doyle (mwhudson)
------------------------------------------------------------
revno: 175 [merge]
committer: Michael Hudson-Doyle <michael.hudson@linaro.org>
branch nick: trunk
timestamp: Wed 2011-12-07 14:44:33 +1300
message:
  Added support for snowball V5 and later (Le Chi Thu)
modified:
  lava_dispatcher/connection.py
  lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf


--
lp:lava-dispatcher
https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk

You are subscribed to branch lp:lava-dispatcher.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'lava_dispatcher/connection.py'
--- lava_dispatcher/connection.py	2011-11-21 23:06:03 +0000
+++ lava_dispatcher/connection.py	2011-12-06 20:54:58 +0000
@@ -90,14 +90,7 @@ 
         logging.info("Perform hard reset on the system")
         self.proc.send("~$")
         self.proc.sendline("hardreset")
-        # XXX Workaround for snowball
-        if self.device_option('device_type') == "snowball_sd":
-            time.sleep(10)
-            self.in_master_shell(300)
-            # Intentionally avoid self.soft_reboot() to prevent looping
-            self.proc.sendline("reboot")
-            self.enter_uboot()
-
+		
     def _boot(self, boot_cmds):
         self.soft_reboot()
         try:

=== modified file 'lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf'
--- lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2011-10-20 04:09:15 +0000
+++ lava_dispatcher/default-config/lava-dispatcher/device-types/snowball.conf	2011-12-06 20:54:58 +0000
@@ -9,5 +9,11 @@ 
     hwmem=48M@302M mem=152M@360M'",
     boot
 
-#boot_cmds_android = TBD
+boot_cmds_android = mmc init,
+    mmc rescan 1,
+    setenv initrd_high "'0xffffffff'",
+    setenv fdt_high "'0xffffffff'",
+    setenv bootcmd "'fat load mmc 1:3 0x00100000 /uImage; fat load mmc 1:3 0x05000000 /uInitrd; bootm 0x00100000 0x05000000'",
+    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'",
+    boot
 bootloader_prompt = $