From patchwork Thu Jul 21 19:51:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Westby X-Patchwork-Id: 3033 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 6B15A23F46 for ; Thu, 21 Jul 2011 19:51:24 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 34025A187DA for ; Thu, 21 Jul 2011 19:51:24 +0000 (UTC) Received: by qwb8 with SMTP id 8so1159067qwb.11 for ; Thu, 21 Jul 2011 12:51:23 -0700 (PDT) Received: by 10.229.68.200 with SMTP id w8mr670293qci.114.1311277883646; Thu, 21 Jul 2011 12:51:23 -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.229.217.78 with SMTP id hl14cs150097qcb; Thu, 21 Jul 2011 12:51:23 -0700 (PDT) Received: by 10.227.173.202 with SMTP id q10mr540243wbz.91.1311277882308; Thu, 21 Jul 2011 12:51:22 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id fe2si3157810wbb.44.2011.07.21.12.51.21; Thu, 21 Jul 2011 12:51:22 -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 1QjzHF-0007qB-Me for ; Thu, 21 Jul 2011 19:51:21 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id A7EB62E84FB for ; Thu, 21 Jul 2011 19:51:21 +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: 382 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 382: Set default display to give decent output where EDID probing isn't supported. Message-Id: <20110721195121.13026.60326.launchpad@loganberry.canonical.com> Date: Thu, 21 Jul 2011 19:51:21 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13475"; Instance="initZopeless config overlay" X-Launchpad-Hash: f8543e35efd7f69665b29c161110a126218ac348 Merge authors: Andy Doan (doanac) Related merge proposals: https://code.launchpad.net/~doanac/linaro-image-tools/overo-display-updates/+merge/68598 proposed by: Andy Doan (doanac) review: Approve - Ricardo Salveti (rsalveti) ------------------------------------------------------------ revno: 382 [merge] committer: James Westby branch nick: trunk timestamp: Thu 2011-07-21 15:49:45 -0400 message: Set default display to give decent output where EDID probing isn't supported. 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-07-05 18:43:01 +0000 +++ linaro_image_tools/media_create/boards.py 2011-07-19 22:19:43 +0000 @@ -612,7 +612,8 @@ load_addr = '0x80008000' boot_script = 'boot.scr' extra_boot_args_options = ( - 'earlyprintk mpurate=${mpurate} vram=12M') + 'earlyprintk mpurate=${mpurate} vram=12M ' + 'omapdss.def_disp=${defaultdisplay} omapfb.mode=dvi:${dvimode}') class PandaConfig(OmapConfig): === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-07-18 14:38:39 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-07-19 22:19:43 +0000 @@ -1247,7 +1247,9 @@ expected = { 'bootargs': 'console=tty0 console=ttyO2,115200n8 ' 'root=UUID=deadbeef rootwait ro earlyprintk ' - 'mpurate=${mpurate} vram=12M', + 'mpurate=${mpurate} vram=12M ' + 'omapdss.def_disp=${defaultdisplay} ' + 'omapfb.mode=dvi:${dvimode}', 'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; ' 'fatload mmc 0:1 0x81600000 uInitrd; ' 'fatload mmc 0:1 0x815f0000 board.dtb; '