From patchwork Fri May 20 13:45:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 1558 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:53:04 -0000 Delivered-To: patches@linaro.org Received: by 10.224.54.134 with SMTP id q6cs161347qag; Fri, 20 May 2011 06:45:39 -0700 (PDT) Received: by 10.216.65.142 with SMTP id f14mr4193354wed.2.1305899138218; Fri, 20 May 2011 06:45:38 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id u62si7006341wen.70.2011.05.20.06.45.37; Fri, 20 May 2011 06:45:38 -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 1QNQ1J-000284-GQ for ; Fri, 20 May 2011 13:45:37 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 6C34E2E889C for ; Fri, 20 May 2011 13:45:37 +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: 340 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 340: Make sure that the --mmc option cannot be used for the snowball_emmc board config, as that usage ... Message-Id: <20110520134537.21036.29675.launchpad@loganberry.canonical.com> Date: Fri, 20 May 2011 13:45:37 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13085"; Instance="initZopeless config overlay" X-Launchpad-Hash: c8ac74ce82b6be9ce55e6979e93a902b0ade6419 Merge authors: Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/snowball-no-mmc-option/+merge/61584 proposed by: Mattias Backman (mabac) review: Approve - Tony Mansson (tony-mansson) review: Approve - Hans Odeberg (hans-odeberg) review: Approve - Loïc Minier (lool) ------------------------------------------------------------ revno: 340 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Fri 2011-05-20 15:41:31 +0200 message: Make sure that the --mmc option cannot be used for the snowball_emmc board config, as that usage would be confusing. modified: linaro-media-create 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-media-create' --- linaro-media-create 2011-05-05 17:47:41 +0000 +++ linaro-media-create 2011-05-19 14:30:21 +0000 @@ -119,6 +119,10 @@ media = Media(args.device) if media.is_block_device: + if not board_config.supports_writing_to_mmc: + print "The board '%s' does not support the --mmc option. Please use " \ + "--image_file to create an image file for this board." % args.board + sys.exit(1) if not confirm_device_selection_and_ensure_it_is_ready(args.device): sys.exit(1) elif not args.should_format_rootfs or not args.should_format_bootfs: === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2011-05-20 07:51:46 +0000 +++ linaro_image_tools/media_create/boards.py 2011-05-20 13:41:31 +0000 @@ -141,6 +141,7 @@ extra_serial_opts = '' live_serial_opts = '' extra_boot_args_options = None + supports_writing_to_mmc = True # These attributes must be defined on all subclasses. kernel_addr = None @@ -518,6 +519,7 @@ # Boot ROM looks for a boot table of contents (TOC) at 0x20000 # Actually, it first looks at address 0, but that's where l-m-c # puts the MBR, so the boot loader skips that address. + supports_writing_to_mmc = False SNOWBALL_LOADER_START_S = (128 * 1024) / SECTOR_SIZE SNOWBALL_STARTUP_FILES_CONFIG = 'startfiles.cfg' TOC_SIZE = 512