From patchwork Wed Feb 23 10:07:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= X-Patchwork-Id: 203 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:40:50 -0000 Delivered-To: patches@linaro.org Received: by 10.224.19.208 with SMTP id c16cs280055qab; Wed, 23 Feb 2011 02:07:47 -0800 (PST) Received: by 10.216.5.65 with SMTP id 43mr3815329wek.9.1298455657448; Wed, 23 Feb 2011 02:07:37 -0800 (PST) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id f6si10926166wed.140.2011.02.23.02.07.37; Wed, 23 Feb 2011 02:07:37 -0800 (PST) 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 1PsBdA-0003Lh-O8 for ; Wed, 23 Feb 2011 10:07:36 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id ADECF2E80C2 for ; Wed, 23 Feb 2011 10:07:36 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-maintainers/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 289 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 289: Merge lp:~doanac/linaro-image-tools/overo-video; enable Overo on 1024x768. Message-Id: <20110223100736.28655.54218.launchpad@loganberry.canonical.com> Date: Wed, 23 Feb 2011 10:07:36 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="12406"; Instance="initZopeless config overlay" X-Launchpad-Hash: 3a49732b220f1fe2e2bb0fb857fee9a8d3b571a3 Merge authors: Andy Doan (doanac) Related merge proposals: https://code.launchpad.net/~doanac/linaro-image-tools/overo-video/+merge/50837 proposed by: Andy Doan (doanac) ------------------------------------------------------------ revno: 289 [merge] committer: Loïc Minier branch nick: linaro-image-tools timestamp: Wed 2011-02-23 11:03:45 +0100 message: Merge lp:~doanac/linaro-image-tools/overo-video; enable Overo on 1024x768. modified: linaro_media_create/boards.py linaro_media_create/tests/test_media_create.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-maintainers/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-maintainers/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_media_create/boards.py' --- linaro_media_create/boards.py 2011-02-14 16:26:08 +0000 +++ linaro_media_create/boards.py 2011-02-23 00:35:47 +0000 @@ -290,7 +290,8 @@ kernel_suffix = 'linaro-omap' boot_script = 'boot.scr' extra_boot_args_options = ( - 'earlyprintk') + 'earlyprintk mpurate=500 vram=12M ' + 'omapfb.mode=dvi:1024x768MR-16@60 omapdss.def_disp=dvi') class PandaConfig(OmapConfig): === modified file 'linaro_media_create/tests/test_media_create.py' --- linaro_media_create/tests/test_media_create.py 2011-02-11 19:36:32 +0000 +++ linaro_media_create/tests/test_media_create.py 2011-02-23 00:35:47 +0000 @@ -457,7 +457,8 @@ "fatload mmc 0:1 0x81600000 uInitrd; bootm 0x80000000 " "0x81600000'\nsetenv bootargs 'console=tty0 " "console=ttyO2,115200n8 root=UUID=deadbeef rootwait ro " - "earlyprintk'\nboot") + "earlyprintk mpurate=500 vram=12M " + "omapfb.mode=dvi:1024x768MR-16@60 omapdss.def_disp=dvi'\nboot") self.assertEqual(expected, boot_cmd)