From patchwork Thu Apr 7 20:48:20 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: 931 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:47:30 -0000 Delivered-To: patches@linaro.org Received: by 10.68.52.132 with SMTP id t4cs114930pbo; Thu, 7 Apr 2011 13:48:22 -0700 (PDT) Received: by 10.227.61.13 with SMTP id r13mr1409513wbh.52.1302209300940; Thu, 07 Apr 2011 13:48:20 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id o5si4334663wby.114.2011.04.07.13.48.20; Thu, 07 Apr 2011 13:48:20 -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 1Q7w7o-0004xV-5D for ; Thu, 07 Apr 2011 20:48:20 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 2616B2E800B for ; Thu, 7 Apr 2011 20:48:20 +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: 316 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 316: Merge lp:~hrw/linaro-image-tools/more-ram-for-pandaboard; gives more RAM on Message-Id: <20110407204820.4851.65612.launchpad@loganberry.canonical.com> Date: Thu, 07 Apr 2011 20:48:20 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="12757"; Instance="initZopeless config overlay" X-Launchpad-Hash: c8e9b0c808cc2c304786a2210a59dd846da4993c Merge authors: Marcin Juszkiewicz (hrw) Related merge proposals: https://code.launchpad.net/~hrw/linaro-image-tools/more-ram-for-pandaboard/+merge/56602 proposed by: Marcin Juszkiewicz (hrw) review: Approve - Loïc Minier (lool) ------------------------------------------------------------ revno: 316 [merge] committer: Loïc Minier branch nick: linaro-image-tools timestamp: Thu 2011-04-07 22:46:11 +0200 message: Merge lp:~hrw/linaro-image-tools/more-ram-for-pandaboard; gives more RAM on Panda boards; LP: #707047. 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-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_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2011-04-06 12:54:22 +0000 +++ linaro_image_tools/media_create/boards.py 2011-04-07 20:46:11 +0000 @@ -475,7 +475,7 @@ boot_script = 'boot.scr' extra_boot_args_options = ( 'earlyprintk fixrtc nocompcache vram=32M ' - 'omapfb.vram=0:8M mem=463M ip=none') + 'omapfb.vram=0:8M mem=463M@0x80000000 mem=512M@0xA0000000 ip=none') 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-04-06 12:54:22 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-04-07 20:46:11 +0000 @@ -403,8 +403,8 @@ expected = { 'bootargs': 'console=tty0 console=ttyO2,115200n8 ' 'root=UUID=deadbeef rootwait ro earlyprintk fixrtc ' - 'nocompcache vram=32M omapfb.vram=0:8M mem=463M ' - 'ip=none', + 'nocompcache vram=32M omapfb.vram=0:8M ' + 'mem=463M@0x80000000 mem=512M@0xA0000000 ip=none', 'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; ' 'fatload mmc 0:1 0x81600000 uInitrd; ' 'bootm 0x80200000 0x81600000'}