From patchwork Mon Jun 25 07:19:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milo Casagrande X-Patchwork-Id: 9594 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 40D5323F19 for ; Mon, 25 Jun 2012 07:19:15 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id E4E93A181DB for ; Mon, 25 Jun 2012 07:19:14 +0000 (UTC) Received: by ghbz12 with SMTP id z12so2793636ghb.11 for ; Mon, 25 Jun 2012 00:19:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=Tii0Axji+0ZAD2ht/K+FxXXZJUYvSINiPkmOWoc1CsM=; b=oT2uxqbpCuTGYRdaFhJZOjh0rfV1QmYlXbCM4zh+x8AqvaaXrLCZUMmyRV1b7QoiAL 7z4ZRmbtj+rOTTt16MVewQNNBS+PNR6NyES64nZLxE2Jo5Zh45/WjN7FOMQv+Kueg7a5 /RrTprwMiGZXdIy+gWlJk6hgB5l9hA1YVmWstnEIMZeYuUl8XHZa38XsoZU8RJ9qxTUT kyu3RUjhcPL3oNevnwxUuhyiEPmnmCPf+ATMQD+pfxqKhjGKkDoKwH3T9Rpv9YwS7j+C 70lnSuWE6Ym13mcC/hM4YqmJu9W0/8xSSIgoEB9WXBRFqgOBmohTAksYlNTycdF3DrS+ 1eDQ== Received: by 10.50.193.196 with SMTP id hq4mr7211976igc.57.1340608754313; Mon, 25 Jun 2012 00:19:14 -0700 (PDT) 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.231.24.148 with SMTP id v20csp35105ibb; Mon, 25 Jun 2012 00:19:13 -0700 (PDT) Received: by 10.180.96.3 with SMTP id do3mr9044325wib.5.1340608752498; Mon, 25 Jun 2012 00:19:12 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id w48si15308898wek.61.2012.06.25.00.19.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jun 2012 00:19:12 -0700 (PDT) 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 1Sj3Zn-0003XZ-Rq for ; Mon, 25 Jun 2012 07:19:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id C9BDEE00BD for ; Mon, 25 Jun 2012 07:19:11 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 532 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 532: Merged lp:~vishalbhoj/linaro-image-tools/panda-dt. Message-Id: <20120625071911.32566.28831.launchpad@ackee.canonical.com> Date: Mon, 25 Jun 2012 07:19:11 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15482"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 5c49a2fc6d1f8803c7fb61d710a7afa99551d765 X-Gm-Message-State: ALoCoQkK9mrLGVQxD0QNAEZTsRcnEKVxdSOu+RuuGmvsMTkW2DlYf9h/EurWw5OfuYUyAm+ZeHSI Merge authors: vishal (vishalbhoj) Related merge proposals: https://code.launchpad.net/~vishalbhoj/linaro-image-tools/panda-dt/+merge/111352 proposed by: vishal (vishalbhoj) review: Approve - Milo Casagrande (milo) ------------------------------------------------------------ revno: 532 [merge] committer: Milo Casagrande branch nick: trunk timestamp: Mon 2012-06-25 09:18:02 +0200 message: Merged lp:~vishalbhoj/linaro-image-tools/panda-dt. modified: linaro_image_tools/media_create/android_boards.py linaro_image_tools/media_create/tests/test_media_create.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/media_create/android_boards.py' --- linaro_image_tools/media_create/android_boards.py 2012-06-13 14:43:59 +0000 +++ linaro_image_tools/media_create/android_boards.py 2012-06-25 07:18:02 +0000 @@ -189,12 +189,14 @@ class AndroidPandaConfig(AndroidOmapConfig, PandaConfig): + uboot_flavor = 'omap4_panda' + dtb_addr = '0x815f0000' + dtb_name = 'board.dtb' _extra_serial_opts = 'console=ttyO2,115200n8' extra_boot_args_options = ( 'earlyprintk fixrtc nocompcache vram=48M ' 'omapfb.vram=0:24M,1:24M mem=456M@0x80000000 mem=512M@0xA0000000') android_specific_args = 'init=/init androidboot.console=ttyO2' - dtb_name = None class AndroidSnowballSdConfig(AndroidBoardConfig, SnowballSdConfig): === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2012-06-13 14:11:28 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2012-06-25 07:18:02 +0000 @@ -1796,7 +1796,8 @@ 'init=/init androidboot.console=ttyO2', 'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; ' 'fatload mmc 0:1 0x81600000 uInitrd; ' - 'bootm 0x80200000 0x81600000'} + 'fatload mmc 0:1 0x815f0000 board.dtb; ' + 'bootm 0x80200000 0x81600000 0x815f0000'} self.assertBootEnv(config, expected) def test_android_snowball_sd(self):