From patchwork Fri Aug 16 09:32:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 19212 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f199.google.com (mail-ye0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E82CF248E6 for ; Fri, 16 Aug 2013 09:32:28 +0000 (UTC) Received: by mail-ye0-f199.google.com with SMTP id l12sf1870258yen.6 for ; Fri, 16 Aug 2013 02:32:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:delivered-to:mime-version:to:from:subject :message-id:date:reply-to:sender:errors-to:precedence :x-original-sender:x-original-authentication-results:mailing-list :list-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=oqOPgNUwUu9Qo1bGMqEYILcZhH6Rm+3Dk64+Y/rpDjI=; b=fCMMN1gYB/gQws3JC3V9SIf5Pu9mp3HazKQQN4rkoO7/5Igu7N/F7zO88jJv+MP0yR iY7VmRt95Lz/wmtnlMfxi9/poAXHEErK6bZK40OyKjSyAPc4FCSBOKA3QkfwpTQL5JkN 2xh3OR9gfIx5HDIlMulezjJF/9HCVs88XSvV5cWcO0A8k2MC8Xfv4fyn6sGFE/TaGxZY Z7mRZHkPb3IZ9a5GhqtYmLZT0WelCd1PpyfYDteHkraIVH/jQaSleo1dguxUHzsiawBD LryXc6FHp1gkRLDRfamF7vBUYnDyUV6oINsLt2FBOQtCN3kbzTaZHAGC60Z5WZoeUj1r ZHEQ== X-Received: by 10.236.209.103 with SMTP id r67mr237763yho.35.1376645548387; Fri, 16 Aug 2013 02:32:28 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.117.195 with SMTP id kg3ls731255qeb.27.gmail; Fri, 16 Aug 2013 02:32:28 -0700 (PDT) X-Received: by 10.220.91.16 with SMTP id k16mr372550vcm.21.1376645548223; Fri, 16 Aug 2013 02:32:28 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id fx3si135227vcb.52.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 16 Aug 2013 02:32:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id oy10so1250680veb.20 for ; Fri, 16 Aug 2013 02:32:28 -0700 (PDT) X-Gm-Message-State: ALoCoQkefuwm5VT5g03JsWjW9F8fNHM0ThVLNZFjL26YWRqBCIdrrnca0g1g7gpsFrkGQEbGPML2 X-Received: by 10.220.174.200 with SMTP id u8mr377235vcz.6.1376645548123; Fri, 16 Aug 2013 02:32:28 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp59128vcz; Fri, 16 Aug 2013 02:32:27 -0700 (PDT) X-Received: by 10.180.183.137 with SMTP id em9mr4595379wic.29.1376645546843; Fri, 16 Aug 2013 02:32:26 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id i6si2366962wie.35.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 16 Aug 2013 02:32:26 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1VAGOQ-0000wV-9D for ; Fri, 16 Aug 2013 09:32:26 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 36DB5E039A for ; Fri, 16 Aug 2013 09:32:26 +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: 636 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 636: Add workaround for Arndale bootcmd on OpenEmbedded (LP: #1208815) Message-Id: <20130816093226.14513.85994.launchpad@ackee.canonical.com> Date: Fri, 16 Aug 2013 09:32:26 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16723"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0fe3dfc62126119e7d444ed9de9336d06db3d78a X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ------------------------------------------------------------ revno: 636 committer: Fathi Boudra branch nick: linaro-image-tools timestamp: Fri 2013-08-16 12:30:08 +0300 message: Add workaround for Arndale bootcmd on OpenEmbedded (LP: #1208815) modified: linaro-media-create --- 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 2013-04-03 10:05:46 +0000 +++ linaro-media-create 2013-08-16 09:30:08 +0000 @@ -234,6 +234,17 @@ # In case we're only extracting the kernel packages, avoid # using uuid because we don't have a working initrd if extract_kpkgs: + # XXX: workaround https://bugs.launchpad.net/bugs/1208815 + # When we use OE, we don't have initrd/UUID and fallback to pass + # root=/dev/mmcblk0p3 to the kernel. It's based on mmc_option value + # provided by the hardware configuration (mmc_id: '0:2'). + # At U-Boot stage, the value is correct and we load from mmc 0:2. + # At the kernel stage, the value becomes incorrect because Arndale + # has eMMC and rootfs can be found on /dev/mmcblk1p3. + # Since the boot commands are calculated based on the same mmc_id + # parameter, Arndale can't boot in this use case. + if board_config.board == 'arndale': + board_config.mmc_device_id = board_config.mmc_device_id + 1 # XXX: this needs to be smarter as we can't always assume mmcblk devices rootfs_id = '/dev/mmcblk%dp%s' % ( board_config.mmc_device_id, 2 + board_config.mmc_part_offset)