From patchwork Wed Aug 10 22:44:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Westby X-Patchwork-Id: 3382 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 81C3223F3F for ; Wed, 10 Aug 2011 22:44:25 +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 48EDEA18344 for ; Wed, 10 Aug 2011 22:44:25 +0000 (UTC) Received: by qwb8 with SMTP id 8so1187146qwb.11 for ; Wed, 10 Aug 2011 15:44:24 -0700 (PDT) Received: by 10.229.163.10 with SMTP id y10mr100092qcx.83.1313016264726; Wed, 10 Aug 2011 15:44:24 -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.190.71 with SMTP id dh7cs96241qcb; Wed, 10 Aug 2011 15:44:24 -0700 (PDT) Received: from mr.google.com ([10.227.19.147]) by 10.227.19.147 with SMTP id a19mr4862503wbb.98.1313016264051 (num_hops = 1); Wed, 10 Aug 2011 15:44:24 -0700 (PDT) Received: by 10.227.19.147 with SMTP id a19mr3476470wbb.98.1313016262462; Wed, 10 Aug 2011 15:44:22 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id n6si3785766wbh.43.2011.08.10.15.44.22; Wed, 10 Aug 2011 15:44:22 -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 1QrHVd-00079j-PO for ; Wed, 10 Aug 2011 22:44:21 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id B62262EED87 for ; Wed, 10 Aug 2011 22:44:21 +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: 403 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 403: Set initrd_high and fdt_high u-boot env vars on Panda. Message-Id: <20110810224421.29548.2184.launchpad@loganberry.canonical.com> Date: Wed, 10 Aug 2011 22:44:21 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13644"; Instance="initZopeless config overlay" X-Launchpad-Hash: 1c7245e6f0cba4f9331cd76f24a014dc8eba8eea Merge authors: David Long (dave-long) Related merge proposals: https://code.launchpad.net/~dave-long/linaro-image-tools/fix-panda-u-boot/+merge/67554 proposed by: David Long (dave-long) review: Approve - Ricardo Salveti (rsalveti) review: Approve - James Tunnicliffe (dooferlad) ------------------------------------------------------------ revno: 403 [merge] committer: James Westby branch nick: trunk timestamp: Wed 2011-08-10 18:42:02 -0400 message: Set initrd_high and fdt_high u-boot env vars on Panda. 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-07-28 01:02:24 +0000 +++ linaro_image_tools/media_create/boards.py 2011-08-10 22:42:02 +0000 @@ -1201,6 +1201,8 @@ # https://bugs.launchpad.net/linaro-image-tools/+bug/788765 # for more. return ( + 'setenv initrd_high "0xffffffff"\n' + 'setenv fdt_high "0xffffffff"\n' 'setenv bootcmd "%(bootcmd)s"\n' 'setenv bootargs "%(bootargs)s"\n' "boot" === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-07-28 10:43:00 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-08-10 22:42:02 +0000 @@ -1480,6 +1480,8 @@ boot_env = {'bootargs': 'mybootargs', 'bootcmd': 'mybootcmd'} boot_script_data = get_plain_boot_script_contents(boot_env) self.assertEqual(textwrap.dedent("""\ + setenv initrd_high "0xffffffff" + setenv fdt_high "0xffffffff" setenv bootcmd "mybootcmd" setenv bootargs "mybootargs" boot"""), boot_script_data)