From patchwork Mon May 23 14:30:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 1586 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:20 -0000 Delivered-To: patches@linaro.org Received: by 10.224.54.134 with SMTP id q6cs66980qag; Mon, 23 May 2011 07:30:42 -0700 (PDT) Received: by 10.217.7.67 with SMTP id z45mr2205199wes.73.1306161041695; Mon, 23 May 2011 07:30:41 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id i48si90837wer.55.2011.05.23.07.30.41; Mon, 23 May 2011 07:30:41 -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 1QOW9Y-00048a-OI for ; Mon, 23 May 2011 14:30:40 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id AE1FF2E84F6 for ; Mon, 23 May 2011 14:30:40 +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: 341 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 341: Merge lp:~asac/linaro-image-tools/panda-display-vram-24m; allocate more memory for Panda 1080p re... Message-Id: <20110523143040.23678.11748.launchpad@loganberry.canonical.com> Date: Mon, 23 May 2011 14:30:40 -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: 0a6b92db36c021ecb0a9ad421ca84a0a240402ef Merge authors: Alexander Sack (asac) Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~asac/linaro-image-tools/panda-display-vram-24m/+merge/61928 proposed by: Alexander Sack (asac) review: Approve - Loïc Minier (lool) review: Needs Fixing - Mattias Backman (mabac) ------------------------------------------------------------ revno: 341 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Mon 2011-05-23 16:23:03 +0200 message: Merge lp:~asac/linaro-image-tools/panda-display-vram-24m; allocate more memory for Panda 1080p resolution. 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-20 13:41:31 +0000 +++ linaro_image_tools/media_create/boards.py 2011-05-23 09:26:28 +0000 @@ -449,8 +449,8 @@ load_addr = '0x80008000' boot_script = 'boot.scr' extra_boot_args_options = ( - 'earlyprintk fixrtc nocompcache vram=32M ' - 'omapfb.vram=0:8M mem=456M@0x80000000 mem=512M@0xA0000000') + 'earlyprintk fixrtc nocompcache vram=48M ' + 'omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000') class IgepConfig(BeagleConfig): === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-05-20 08:24:17 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-05-23 09:26:28 +0000 @@ -437,7 +437,7 @@ expected = { 'bootargs': 'console=tty0 console=ttyO2,115200n8 ' 'root=UUID=deadbeef rootwait ro earlyprintk fixrtc ' - 'nocompcache vram=32M omapfb.vram=0:8M ' + 'nocompcache vram=48M omapfb.vram=0:24M ' 'mem=456M@0x80000000 mem=512M@0xA0000000', 'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; ' 'fatload mmc 0:1 0x81600000 uInitrd; '