From patchwork Thu Apr 21 13:19:16 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: 1142 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:49:37 -0000 Delivered-To: patches@linaro.org Received: by 10.224.67.148 with SMTP id r20cs163857qai; Thu, 21 Apr 2011 06:19:18 -0700 (PDT) Received: by 10.227.139.14 with SMTP id c14mr8898837wbu.55.1303391957281; Thu, 21 Apr 2011 06:19:17 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id l2si4207636wba.113.2011.04.21.06.19.16; Thu, 21 Apr 2011 06:19:17 -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 1QCtmu-0006nq-Ja for ; Thu, 21 Apr 2011 13:19:16 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 8EB8D2E889C for ; Thu, 21 Apr 2011 13:19:16 +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: 321 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 321: Raise an assertion error when _get_bootcmd() is called with a d_img_data but Message-Id: <20110421131916.9911.15995.launchpad@loganberry.canonical.com> Date: Thu, 21 Apr 2011 13:19: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="12883"; Instance="initZopeless config overlay" X-Launchpad-Hash: acaa39d8ddb18a235c9606269bb3069a5e684f0a ------------------------------------------------------------ revno: 321 committer: Loïc Minier branch nick: linaro-image-tools timestamp: Thu 2011-04-21 14:54:25 +0200 message: Raise an assertion error when _get_bootcmd() is called with a d_img_data but cls.dtb_addr is None. 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-04-20 14:42:47 +0000 +++ linaro_image_tools/media_create/boards.py 2011-04-21 12:54:25 +0000 @@ -255,6 +255,8 @@ "fatload mmc %(mmc_option)s %(initrd_addr)s uInitrd; " % replacements) if d_img_data is not None: + assert cls.dtb_addr is not None, ( + "Need a dtb_addr when passing d_img_data") boot_script += ( "fatload mmc %(mmc_option)s %(dtb_addr)s board.dtb; " "bootm %(kernel_addr)s %(initrd_addr)s %(dtb_addr)s"