From patchwork Thu Jun 23 14:25:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Westby X-Patchwork-Id: 2220 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 35C2A23F7C for ; Thu, 23 Jun 2011 14:25:34 +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 00567A189B5 for ; Thu, 23 Jun 2011 14:25:33 +0000 (UTC) Received: by qwb8 with SMTP id 8so1394441qwb.11 for ; Thu, 23 Jun 2011 07:25:33 -0700 (PDT) Received: by 10.229.30.3 with SMTP id s3mr449290qcc.21.1308839133456; Thu, 23 Jun 2011 07:25:33 -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 jm11cs19331qcb; Thu, 23 Jun 2011 07:25:33 -0700 (PDT) Received: by 10.216.58.138 with SMTP id q10mr1079544wec.95.1308839132470; Thu, 23 Jun 2011 07:25:32 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id n18si3941675wed.104.2011.06.23.07.25.32; Thu, 23 Jun 2011 07:25:32 -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 1QZkqZ-0006hK-Q7 for ; Thu, 23 Jun 2011 14:25:31 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id C0D5B2E8910 for ; Thu, 23 Jun 2011 14:25:31 +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: 362 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 362: Support both new and old SPL filenames for smdkv310. Message-Id: <20110623142531.4131.79526.launchpad@loganberry.canonical.com> Date: Thu, 23 Jun 2011 14:25:31 -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: f4843750f48ace1623e9efcef0b28d0612c8c88d Merge authors: Angus Ainslie (angus-akkea) Related merge proposals: https://code.launchpad.net/~linaro-landing-team-samsung/linaro-image-tools/v310-spl-name-fix/+merge/65599 proposed by: Angus Ainslie (angus-akkea) ------------------------------------------------------------ revno: 362 [merge] committer: James Westby branch nick: trunk timestamp: Thu 2011-06-23 10:22:16 -0400 message: Support both new and old SPL filenames for smdkv310. modified: linaro_image_tools/media_create/boards.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-06-23 13:08:29 +0000 +++ linaro_image_tools/media_create/boards.py 2011-06-23 14:22:16 +0000 @@ -800,9 +800,23 @@ def _make_boot_files(cls, boot_env, chroot_dir, boot_dir, boot_device_or_file, k_img_data, i_img_data, d_img_data): - spl_file = os.path.join( + old_spl_path = os.path.join( chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor, 'v310_mmc_spl.bin') + new_spl_path = os.path.join( + chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor, + 'u-boot-mmc-spl.bin') + + spl_file = old_spl_path + # The new upstream u-boot filename has changed + if not os.path.exists(spl_file): + spl_file = new_spl_path + + if not os.path.exists(spl_file): + # missing SPL loader + raise AssertionError("Couldn't find the SPL file, tried %s and %s" + % (old_spl_path, new_spl_path)) + # XXX need to check that the length of spl_file is smaller than # SAMSUNG_V310_BL1_LEN _dd(spl_file, boot_device_or_file, seek=SAMSUNG_V310_BL1_START)