From patchwork Mon Mar 28 20:24:22 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: 815 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:46:06 -0000 Delivered-To: patches@linaro.org Received: by 10.42.161.68 with SMTP id s4cs126985icx; Mon, 28 Mar 2011 13:24:23 -0700 (PDT) Received: by 10.227.162.197 with SMTP id w5mr4260841wbx.191.1301343862755; Mon, 28 Mar 2011 13:24:22 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id h49si7297955wer.138.2011.03.28.13.24.22; Mon, 28 Mar 2011 13:24: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 1Q4Iz8-0006VS-5l for ; Mon, 28 Mar 2011 20:24:22 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 2812F2E896C for ; Mon, 28 Mar 2011 20:24:22 +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: 306 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 306: Merge lp:~jcrigby/linaro-image-tools/mx51-initrd_addr-fix; makes sure the Message-Id: <20110328202422.21683.98800.launchpad@loganberry.canonical.com> Date: Mon, 28 Mar 2011 20:24:22 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="12670"; Instance="initZopeless config overlay" X-Launchpad-Hash: 45d713c23cfbfa7e19814640d75ffa3dea9fa2a3 Merge authors: John Rigby (jcrigby) Related merge proposals: https://code.launchpad.net/~jcrigby/linaro-image-tools/mx51-initrd_addr-fix/+merge/53940 proposed by: John Rigby (jcrigby) review: Approve - Loïc Minier (lool) ------------------------------------------------------------ revno: 306 [merge] committer: Loïc Minier branch nick: linaro-image-tools timestamp: Mon 2011-03-28 22:21:09 +0200 message: Merge lp:~jcrigby/linaro-image-tools/mx51-initrd_addr-fix; makes sure the kernel and initrd addresses are sufficiently far apart; bump initrd to 0x92000000 which is 32 MiB away from the kernel. modified: linaro_image_tools/media_create/boards.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-03-24 18:41:59 +0000 +++ linaro_image_tools/media_create/boards.py 2011-03-28 20:21:09 +0000 @@ -497,7 +497,7 @@ class Mx51Config(Mx5Config): kernel_addr = '0x90000000' - initrd_addr = '0x90800000' + initrd_addr = '0x92000000' load_addr = '0x90008000' kernel_suffix = 'linaro-mx51'