From patchwork Wed Feb 1 15:26:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 6498 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 7502523ECA for ; Wed, 1 Feb 2012 15:26:12 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5DC30A187E9 for ; Wed, 1 Feb 2012 15:26:12 +0000 (UTC) Received: by bkar19 with SMTP id r19so1524525bka.11 for ; Wed, 01 Feb 2012 07:26:12 -0800 (PST) Received: by 10.205.139.12 with SMTP id iu12mr12733667bkc.2.1328109972048; Wed, 01 Feb 2012 07:26:12 -0800 (PST) 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.204.130.220 with SMTP id u28cs213792bks; Wed, 1 Feb 2012 07:26:11 -0800 (PST) Received: by 10.180.81.66 with SMTP id y2mr42193744wix.20.1328109971180; Wed, 01 Feb 2012 07:26:11 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id f1si12091513wed.137.2012.02.01.07.26.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 01 Feb 2012 07:26:11 -0800 (PST) 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 1Rsc4Y-0004bq-T1 for ; Wed, 01 Feb 2012 15:26:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id CEF18E14BE for ; Wed, 1 Feb 2012 15:26:10 +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: 489 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: =?utf-8?q?=5BBranch_=7Elinaro-image-tools/linaro-image-tools/trunk?= =?utf-8?q?=5D_Rev_489=3A_Fix_booting_from_emmc_for_Snowball_by_chang?= =?utf-8?q?ing_mmc_partition=2E_Thanks_Benn_P=C3=B6rscke_for_fixing_t?= =?utf-8?q?his=2E?= Message-Id: <20120201152610.27867.40897.launchpad@ackee.canonical.com> Date: Wed, 01 Feb 2012 15:26:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14738"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 03b368a92139fc4e30578decc9b3dde68a2ed70b Merge authors: Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/bug-923650-snowball-android-emmc/+merge/91078 proposed by: Mattias Backman (mabac) review: Approve - Benn Pörscke (bennporscke) review: Approve - Guilherme Salgado (salgado) ------------------------------------------------------------ revno: 489 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Wed 2012-02-01 16:24:13 +0100 message: Fix booting from emmc for Snowball by changing mmc partition. Thanks Benn Pörscke for fixing this. modified: linaro_image_tools/media_create/android_boards.py linaro_image_tools/media_create/tests/test_media_create.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/android_boards.py' --- linaro_image_tools/media_create/android_boards.py 2011-12-22 14:24:17 +0000 +++ linaro_image_tools/media_create/android_boards.py 2012-02-01 13:49:49 +0000 @@ -207,6 +207,7 @@ 'earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M vmalloc=256M') _extra_serial_opts = 'console=ttyAMA2,115200n8' android_specific_args = 'init=/init androidboot.console=ttyAMA2' + mmc_option = '0:2' # Snowball uses a custom uboot: # it uses "fat load" instead of fatload and # needs uImage/uInitrd prefixed with / === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2012-01-24 18:40:27 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2012-02-01 13:49:49 +0000 @@ -1522,8 +1522,8 @@ 'mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M ' 'mem=48M@328M mem_issw=1M@383M mem=640M@384M ' 'vmalloc=256M init=/init androidboot.console=ttyAMA2', - 'bootcmd': 'fat load mmc 1:1 0x00100000 /uImage; ' - 'fat load mmc 1:1 0x05000000 /uInitrd; ' + 'bootcmd': 'fat load mmc 0:2 0x00100000 /uImage; ' + 'fat load mmc 0:2 0x05000000 /uInitrd; ' 'bootm 0x00100000 0x05000000'} self.assertEqual(expected, boot_commands)