From patchwork Thu Jun 23 14:05:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 2209 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 097A623F7C for ; Thu, 23 Jun 2011 14:05:49 +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 B10B1A189AF for ; Thu, 23 Jun 2011 14:05:48 +0000 (UTC) Received: by qwb8 with SMTP id 8so1379519qwb.11 for ; Thu, 23 Jun 2011 07:05:48 -0700 (PDT) Received: by 10.229.40.139 with SMTP id k11mr1586783qce.135.1308837946395; Thu, 23 Jun 2011 07:05:46 -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.230.139 with SMTP id jm11cs18660qcb; Thu, 23 Jun 2011 07:05:45 -0700 (PDT) Received: by 10.216.234.209 with SMTP id s59mr2166417weq.18.1308837944911; Thu, 23 Jun 2011 07:05:44 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id j2si3893420wed.122.2011.06.23.07.05.44; Thu, 23 Jun 2011 07:05:44 -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 1QZkXN-00083X-Gm for ; Thu, 23 Jun 2011 14:05:42 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 727822E896B for ; Thu, 23 Jun 2011 14:05:37 +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: 361 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 361: Set omapfb.vram=0:24M, 1:24M for Android on Panda. Message-Id: <20110623140537.22820.51286.launchpad@loganberry.canonical.com> Date: Thu, 23 Jun 2011 14:05:37 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13265"; Instance="initZopeless config overlay" X-Launchpad-Hash: deca8f03a8d8808c22ecd3f4955cf5d3863f2bd3 Merge authors: Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/bug-800686/+merge/65504 proposed by: Mattias Backman (mabac) review: Approve - Zach Pfeffer (pfefferz) ------------------------------------------------------------ revno: 361 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Thu 2011-06-23 16:01:31 +0200 message: Set omapfb.vram=0:24M,1:24M for Android on Panda. 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 2011-04-22 15:09:08 +0000 +++ linaro_image_tools/media_create/android_boards.py 2011-06-23 13:08:29 +0000 @@ -149,6 +149,9 @@ class AndroidPandaConfig(AndroidOmapConfig, PandaConfig): _extra_serial_opts = 'console=tty0 console=ttyO2,115200n8' + extra_boot_args_options = ( + 'earlyprintk fixrtc nocompcache vram=48M ' + 'omapfb.vram=0:24M,1:24M mem=456M@0x80000000 mem=512M@0xA0000000') android_specific_args = 'init=/init androidboot.console=ttyO2' === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-06-14 09:45:13 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-06-23 13:55:09 +0000 @@ -57,6 +57,9 @@ _get_mlo_file, _run_mkimage, ) +from linaro_image_tools.media_create.android_boards import ( + android_board_configs, + ) from linaro_image_tools.media_create.chroot_utils import ( copy_file, install_hwpack, @@ -509,6 +512,26 @@ self.assertEqual(expected, boot_commands) +class TestGetBootCmdAndroid(TestCase): + def test_panda(self): + # XXX: To fix bug 697824 we have to change class attributes of our + # OMAP board configs, and some tests do that so to make sure they + # don't interfere with us we'll reset that before doing anything. + config = android_board_configs['panda'] + config.serial_tty = config._serial_tty + boot_commands = config._get_boot_env(consoles=[]) + expected = { + 'bootargs': 'console=tty0 console=ttyO2,115200n8 ' + 'rootwait ro earlyprintk fixrtc ' + 'nocompcache vram=48M omapfb.vram=0:24M,1:24M ' + 'mem=456M@0x80000000 mem=512M@0xA0000000 ' + 'init=/init androidboot.console=ttyO2', + 'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; ' + 'fatload mmc 0:1 0x81600000 uInitrd; ' + 'bootm 0x80200000 0x81600000'} + self.assertEqual(expected, boot_commands) + + class TestUnpackBinaryTarball(TestCaseWithFixtures): def setUp(self):