From patchwork Wed Dec 7 01:51:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 5524 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 1D9E323E0C for ; Wed, 7 Dec 2011 01:51:23 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 156C7A186F5 for ; Wed, 7 Dec 2011 01:51:23 +0000 (UTC) Received: by eaac11 with SMTP id c11so41452eaa.11 for ; Tue, 06 Dec 2011 17:51:23 -0800 (PST) Received: by 10.213.114.3 with SMTP id c3mr3104072ebq.146.1323222681533; Tue, 06 Dec 2011 17:51:21 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs58266bkc; Tue, 6 Dec 2011 17:51:21 -0800 (PST) Received: by 10.180.84.33 with SMTP id v1mr21087484wiy.4.1323222679524; Tue, 06 Dec 2011 17:51:19 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fj12si44580wbb.81.2011.12.06.17.51.19 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 06 Dec 2011 17:51:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RY6fH-0008Ho-8z for ; Wed, 07 Dec 2011 01:51:19 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 3893BE0785 for ; Wed, 7 Dec 2011 01:51:19 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 175 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Wed, 07 Dec 2011 01:51:19 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14435"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 24cfdfa77c4de5eba501eb2867ac3a34c296842f Merge authors: Le Chi Thu 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 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 === 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 = $