From patchwork Wed Feb 8 22:51:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 6714 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 E742423EAA for ; Wed, 8 Feb 2012 22:51:12 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id A072DA18129 for ; Wed, 8 Feb 2012 22:51:12 +0000 (UTC) Received: by yenr11 with SMTP id r11so730096yen.11 for ; Wed, 08 Feb 2012 14:51:12 -0800 (PST) Received: by 10.50.153.133 with SMTP id vg5mr26315090igb.8.1328741471976; Wed, 08 Feb 2012 14:51:11 -0800 (PST) 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.231.12.131 with SMTP id x3cs22201ibx; Wed, 8 Feb 2012 14:51:11 -0800 (PST) Received: by 10.180.86.105 with SMTP id o9mr43786789wiz.4.1328741470872; Wed, 08 Feb 2012 14:51:10 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id h62si444408wed.102.2012.02.08.14.51.10 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Feb 2012 14:51:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1RvGM2-0005Ao-Az for ; Wed, 08 Feb 2012 22:51:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 487C3E0180 for ; Wed, 8 Feb 2012 22:51:10 +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: 490 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 490: snowball: android: Increasing mali memory to 64MB. Message-Id: <20120208225110.891.92183.launchpad@ackee.canonical.com> Date: Wed, 08 Feb 2012 22:51:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14747"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 34a10426fd6894388ff5c93f01350325ebe3ce34 X-Gm-Message-State: ALoCoQl1FJwiGUN7F2SziJjkDdUWJ1Qa52n+AToO2yHBcs+OBu9niqWIW3kUkpY/y+oHEDPSRJIs Merge authors: Mathieu Poirier (mathieu.poirier) Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mathieu.poirier/linaro-image-tools/snowball-mali-64mb-memory/+merge/92131 proposed by: Mathieu Poirier (mathieu.poirier) ------------------------------------------------------------ revno: 490 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Wed 2012-02-08 14:49:48 -0800 message: snowball: android: Increasing mali memory to 64MB. modified: linaro_image_tools/media_create/android_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/android_boards.py' --- linaro_image_tools/media_create/android_boards.py 2012-02-01 13:49:49 +0000 +++ linaro_image_tools/media_create/android_boards.py 2012-02-08 19:34:27 +0000 @@ -190,7 +190,7 @@ boot_script = 'boot.scr' initrd_addr = '0x05000000' extra_boot_args_options = ( - 'earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M vmalloc=256M') + 'earlyprintk mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=256M') _extra_serial_opts = 'console=ttyAMA2,115200n8' android_specific_args = 'init=/init androidboot.console=ttyAMA2' # Snowball uses a custom uboot: @@ -204,7 +204,7 @@ boot_script = 'boot.scr' initrd_addr = '0x05000000' extra_boot_args_options = ( - 'earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M vmalloc=256M') + 'earlyprintk mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=256M') _extra_serial_opts = 'console=ttyAMA2,115200n8' android_specific_args = 'init=/init androidboot.console=ttyAMA2' mmc_option = '0:2' === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2012-02-01 13:49:49 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2012-02-08 22:47:59 +0000 @@ -1505,8 +1505,8 @@ expected = { 'bootargs': 'console=ttyAMA2,115200n8 ' 'rootwait ro earlyprintk ' - 'mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M ' - 'mem=48M@328M mem_issw=1M@383M mem=640M@384M ' + 'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M ' + 'mem=22M@360M mem_issw=1M@383M mem=640M@384M ' 'vmalloc=256M init=/init androidboot.console=ttyAMA2', 'bootcmd': 'fat load mmc 1:1 0x00100000 /uImage; ' 'fat load mmc 1:1 0x05000000 /uInitrd; ' @@ -1519,8 +1519,8 @@ expected = { 'bootargs': 'console=ttyAMA2,115200n8 ' 'rootwait ro earlyprintk ' - 'mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M ' - 'mem=48M@328M mem_issw=1M@383M mem=640M@384M ' + 'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M ' + 'mem=22M@360M mem_issw=1M@383M mem=640M@384M ' 'vmalloc=256M init=/init androidboot.console=ttyAMA2', 'bootcmd': 'fat load mmc 0:2 0x00100000 /uImage; ' 'fat load mmc 0:2 0x05000000 /uInitrd; '