From patchwork Tue May 24 07:00:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 1590 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:53:23 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.230 with SMTP id dz6cs143192vdc; Tue, 24 May 2011 00:00:57 -0700 (PDT) Received: by 10.227.57.143 with SMTP id c15mr2981798wbh.28.1306220456456; Tue, 24 May 2011 00:00:56 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id s1si12665167wbs.7.2011.05.24.00.00.55; Tue, 24 May 2011 00:00:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QOlbq-0002VQ-Sp for ; Tue, 24 May 2011 07:00:54 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id D60732E814B for ; Tue, 24 May 2011 07:00:54 +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: 346 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 346: Merge lp:~rsalveti/linaro-image-tools/beagle-mpurate; Add mpurate=${mpurate} kernel boot argument... Message-Id: <20110524070054.32502.19154.launchpad@loganberry.canonical.com> Date: Tue, 24 May 2011 07:00:54 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13085"; Instance="initZopeless config overlay" X-Launchpad-Hash: 64f4d10338d251c22c4c465a05d73aa4312a796e Merge authors: Ricardo Salveti de Araujo Related merge proposals: https://code.launchpad.net/~rsalveti/linaro-image-tools/beagle-mpurate/+merge/62070 proposed by: Ricardo Salveti (rsalveti) review: Approve - Mattias Backman (mabac) ------------------------------------------------------------ revno: 346 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Tue 2011-05-24 08:57:08 +0200 message: Merge lp:~rsalveti/linaro-image-tools/beagle-mpurate; Add mpurate=${mpurate} kernel boot argument for Beagle Board. modified: linaro_image_tools/media_create/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/boards.py' --- linaro_image_tools/media_create/boards.py 2011-05-23 14:24:24 +0000 +++ linaro_image_tools/media_create/boards.py 2011-05-24 02:22:47 +0000 @@ -419,7 +419,7 @@ boot_script = 'boot.scr' extra_boot_args_options = ( 'earlyprintk fixrtc nocompcache vram=12M ' - 'omapfb.mode=dvi:1280x720MR-16@60') + 'omapfb.mode=dvi:1280x720MR-16@60 mpurate=${mpurate}') class OveroConfig(OmapConfig): === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-05-23 14:24:24 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-05-24 02:22:47 +0000 @@ -458,7 +458,7 @@ 'bootargs': 'console=tty0 console=ttyO2,115200n8 ' 'root=UUID=deadbeef rootwait ro earlyprintk fixrtc ' 'nocompcache vram=12M ' - 'omapfb.mode=dvi:1280x720MR-16@60', + 'omapfb.mode=dvi:1280x720MR-16@60 mpurate=${mpurate}', 'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; ' 'fatload mmc 0:1 0x81600000 uInitrd; ' 'fatload mmc 0:1 0x815f0000 board.dtb; ' @@ -478,7 +478,7 @@ 'bootargs': 'console=tty0 console=ttyO2,115200n8 ' 'root=UUID=deadbeef rootwait ro earlyprintk fixrtc ' 'nocompcache vram=12M ' - 'omapfb.mode=dvi:1280x720MR-16@60', + 'omapfb.mode=dvi:1280x720MR-16@60 mpurate=${mpurate}', 'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; ' 'fatload mmc 0:1 0x81600000 uInitrd; ' 'fatload mmc 0:1 0x815f0000 board.dtb; '