From patchwork Tue Oct 9 16:12:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milo Casagrande X-Patchwork-Id: 12078 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 4BBB223E01 for ; Tue, 9 Oct 2012 16:12:18 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8F4A5A18D09 for ; Tue, 9 Oct 2012 16:12:17 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11589827iej.11 for ; Tue, 09 Oct 2012 09:12:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=5b6HVijvjCM3T9x91LGx8Dnbb4Kc9mvoPfOLJm6LxtQ=; b=GoEdaAwolcHzyH3T++VrfrUKZt0o5LJJeCaCjT5HWJy5SvXFbPV/cLg/JsHHd/B8wq URLrmbfBHU1QMWsqRg+oimFgNo4MtE3KdlCS67EU/M03gvEaeADkNwuF8aM4jGgseHTu WnawbWNOTcuxmV2wSCEiYtyVzdsWnI9xcY1FqILlNE7mD3N/dGcSnpasjJgALstyvoOl r7QGsq34csf059EiC4DXtX29Vkl3LVkUbRTmdQTiUuPFBtLFivd/DWA7ybcUs3WEqoYp X4f7yhHuAXe7MqaV+SWpF8/Xj1KUmL70uBSyBqlQ7hb+sSYSsiFgJ40bC7T+KNmZ3i4W 8hKw== Received: by 10.50.159.194 with SMTP id xe2mr2176211igb.62.1349799137250; Tue, 09 Oct 2012 09:12:17 -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.50.67.148 with SMTP id n20csp79695igt; Tue, 9 Oct 2012 09:12:15 -0700 (PDT) Received: by 10.216.140.11 with SMTP id d11mr9299486wej.29.1349799134692; Tue, 09 Oct 2012 09:12:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id l64si13673752wej.80.2012.10.09.09.12.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 09:12:14 -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 1TLcPm-0006oe-3f for ; Tue, 09 Oct 2012 16:12:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 083B6E1D95 for ; Tue, 9 Oct 2012 16:12:14 +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: 573 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 573: Added support for Foundation fastmodel. Message-Id: <20121009161214.20173.31952.launchpad@ackee.canonical.com> Date: Tue, 09 Oct 2012 16:12:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16112"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0ca3ac30048cd62e581f5c8b08920240b5360186 X-Gm-Message-State: ALoCoQn3yyHLdzhqOumyzZuz9Qju4DAIgOkTLIWdBU7ngzqp8GZhkHfRg2gtkZjvb4Pmnir5KjD/ Merge authors: Ricardo Salveti (rsalveti) Related merge proposals: https://code.launchpad.net/~rsalveti/linaro-image-tools/fastmodel-foundation/+merge/128744 proposed by: Ricardo Salveti (rsalveti) review: Approve - Milo Casagrande (milo) ------------------------------------------------------------ revno: 573 [merge] author: Ricardo Salveti committer: Milo Casagrande branch nick: trunk timestamp: Tue 2012-10-09 18:11:16 +0200 message: Added support for Foundation fastmodel. 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 2012-10-02 15:25:27 +0000 +++ linaro_image_tools/media_create/boards.py 2012-10-09 14:39:52 +0000 @@ -1663,9 +1663,13 @@ d_img_data): output_dir = os.path.dirname(boot_device_or_file) - bootwrapper = _get_file_matching("%s/boot/img.axf" % chroot_dir) + # There are 2 kinds of models now, VE and Foundation + bw_ve = _get_file_matching("%s/boot/img.axf" % chroot_dir) + bw_foundation = _get_file_matching("%s/boot/img-foundation.axf" % + chroot_dir) - for filename in (bootwrapper, k_img_data, i_img_data, d_img_data): + for filename in (bw_ve, bw_foundation, k_img_data, + i_img_data, d_img_data): if filename != None: copy_drop(filename, output_dir)