From patchwork Fri Aug 19 14:09:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 3559 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 7DC2823F22 for ; Fri, 19 Aug 2011 14:09:19 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 480F6A181E7 for ; Fri, 19 Aug 2011 14:09:19 +0000 (UTC) Received: by yxi11 with SMTP id 11so3165022yxi.11 for ; Fri, 19 Aug 2011 07:09:18 -0700 (PDT) Received: by 10.151.10.9 with SMTP id n9mr2390776ybi.390.1313762958660; Fri, 19 Aug 2011 07:09:18 -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.150.157.17 with SMTP id f17cs100330ybe; Fri, 19 Aug 2011 07:09:17 -0700 (PDT) Received: by 10.227.135.142 with SMTP id n14mr3144147wbt.84.1313762957123; Fri, 19 Aug 2011 07:09:17 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com [91.189.90.7]) by mx.google.com with ESMTPS id el5si8531065wbb.28.2011.08.19.07.09.16 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Aug 2011 07:09:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QuPl6-0006ET-BA for ; Fri, 19 Aug 2011 14:09:16 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 4BABBE043F for ; Fri, 19 Aug 2011 14:09:16 +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: 415 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 415: Look for u-boot.img before u-boot.bin which is needed when u-boot SPL is enabled for Pandaboard. Message-Id: <20110819140916.4597.69336.launchpad@ackee.canonical.com> Date: Fri, 19 Aug 2011 14:09:16 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13697"; Instance="initZopeless config overlay" X-Launchpad-Hash: 04109ca3da7eb74d2bfff6a386db267ad6ad3b8b Merge authors: Mattias Backman (mabac) ------------------------------------------------------------ revno: 415 [merge] committer: Mattias Backman branch nick: trunk timestamp: Fri 2011-08-19 16:03:12 +0200 message: Look for u-boot.img before u-boot.bin which is needed when u-boot SPL is enabled for Pandaboard. 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-08-10 22:42:02 +0000 +++ linaro_image_tools/media_create/boards.py 2011-08-19 13:59:34 +0000 @@ -473,7 +473,11 @@ with cls.hardwarepack_handler: default = os.path.join( chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor, - 'u-boot.bin') + 'u-boot.img') + if not os.path.exists(default): + default = os.path.join( + chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor, + 'u-boot.bin') uboot_bin = cls.get_file('u_boot', default=default) proc = cmd_runner.run( ['cp', '-v', uboot_bin, boot_disk], as_root=True)