From patchwork Mon May 23 14:30:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 1585 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 q6cs66981qag; Mon, 23 May 2011 07:30:42 -0700 (PDT) Received: by 10.227.206.14 with SMTP id fs14mr2366333wbb.30.1306161041656; 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 cd5si11416001wbb.72.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 1QOW9Z-00048z-36 for ; Mon, 23 May 2011 14:30:41 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 1560A2E8085 for ; Mon, 23 May 2011 14:30:41 +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: 342 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 342: Merge lp:~doanac/linaro-image-tools/overo-updates; clean up no longer needed video settings for O... Message-Id: <20110523143041.23678.51175.launchpad@loganberry.canonical.com> Date: Mon, 23 May 2011 14:30:41 -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: 9de78e26a4b98ff27ef0dd81f36b3f450190baf0 Merge authors: Andy Doan (doanac) Related merge proposals: https://code.launchpad.net/~doanac/linaro-image-tools/overo-updates/+merge/61789 proposed by: Andy Doan (doanac) review: Approve - Loïc Minier (lool) ------------------------------------------------------------ revno: 342 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Mon 2011-05-23 16:24:24 +0200 message: Merge lp:~doanac/linaro-image-tools/overo-updates; clean up no longer needed video settings for Overo. 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-23 09:26:28 +0000 +++ linaro_image_tools/media_create/boards.py 2011-05-23 14:24:24 +0000 @@ -270,7 +270,7 @@ boot_env = cls._get_boot_env(is_live, is_lowmem, consoles, rootfs_uuid, d_img_data) cls._make_boot_files( - boot_env, chroot_dir, boot_dir, + boot_env, chroot_dir, boot_dir, boot_device_or_file, k_img_data, i_img_data, d_img_data) @classmethod @@ -433,8 +433,7 @@ load_addr = '0x80008000' boot_script = 'boot.scr' extra_boot_args_options = ( - 'earlyprintk mpurate=500 vram=12M ' - 'omapfb.mode=dvi:1024x768MR-16@60 omapdss.def_disp=dvi') + 'earlyprintk mpurate=${mpurate} vram=12M') class PandaConfig(OmapConfig): @@ -914,7 +913,7 @@ def make_boot_script(boot_env, boot_script_path): boot_script_data = ( "setenv bootcmd '%(bootcmd)s'\n" - "setenv bootargs '%(bootargs)s'\n" + "setenv bootargs %(bootargs)s\n" "boot" % boot_env) === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-05-23 09:26:28 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-05-23 14:24:24 +0000 @@ -497,9 +497,7 @@ expected = { 'bootargs': 'console=tty0 console=ttyO2,115200n8 ' 'root=UUID=deadbeef rootwait ro earlyprintk ' - 'mpurate=500 vram=12M ' - 'omapfb.mode=dvi:1024x768MR-16@60 ' - 'omapdss.def_disp=dvi', + 'mpurate=${mpurate} vram=12M', 'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; ' 'fatload mmc 0:1 0x81600000 uInitrd; ' 'fatload mmc 0:1 0x815f0000 board.dtb; '