From patchwork Thu May 24 10:50:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?0JTQsNC90LjQu9C+INCo0LXQs9Cw0L0=?= X-Patchwork-Id: 8942 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 8A89423F0A for ; Thu, 24 May 2012 10:50:18 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 3BA63A184CF for ; Thu, 24 May 2012 10:50:18 +0000 (UTC) Received: by yhpp61 with SMTP id p61so9222171yhp.11 for ; Thu, 24 May 2012 03:50: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=du6+oBw8WD7aTK5xJQgGUZSIF805JobmA78h7YWt3XI=; b=dU6Z3JwMYC4nqwW5x+4gSWyCYCNk60Xa0snS9skCScwrTsKo7LuEpfm2P3/hKb3nMa x2gUQxeBHaIycnN/xgktwCpiamk/QsECfQmdE5KrVdUv1/TJ9SxcqViUFPCKNRuMLss3 bI6nrEUeuAjES8Ji6jol9nfZTx425TMiRqzVPtinZHjuFAGkKseQhsOohwSLIDTFs32D mKJTfbQGCoJ+tNk9dW95Edwn354PXo15zf6wEPDhCDQUngYxgn7iXRbALfNYxC5Xw8Vy xyQUJuzEl+mGIi7KifxyfQ1HjGk2l8VP5a9pevWEmiuQOOk2WsNTJI3bXS174JwGW2yU Zuaw== Received: by 10.43.59.205 with SMTP id wp13mr5211199icb.57.1337856617417; Thu, 24 May 2012 03:50: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.231.35.72 with SMTP id o8csp30054ibd; Thu, 24 May 2012 03:50:16 -0700 (PDT) Received: by 10.216.134.41 with SMTP id r41mr13772837wei.13.1337856616266; Thu, 24 May 2012 03:50:16 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id 83si12546144wet.131.2012.05.24.03.50.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 24 May 2012 03:50:16 -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 1SXVcV-0000nn-Hc for ; Thu, 24 May 2012 10:50:15 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 7C9EDE088E for ; Thu, 24 May 2012 10:50:15 +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: 518 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 518: Use default values for Snowball u-boot-linaro-stable. Patch by Mathieu Poirier. Message-Id: <20120524105015.8963.35605.launchpad@ackee.canonical.com> Date: Thu, 24 May 2012 10:50:15 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15288"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: dd444f830afa1a9334536e3755aa3bd7cb7e187d X-Gm-Message-State: ALoCoQltecDERiEAOSCg7NIhDJjVIM3iL6xjXp0m+ThfhWxUVxa8BltENjSZCAzyMxt95nDrazEV Merge authors: Mathieu Poirier (mathieu.poirier) Related merge proposals: https://code.launchpad.net/~mathieu.poirier/linaro-image-tools/linaro-image-tools.may15/+merge/105848 proposed by: Mathieu Poirier (mathieu.poirier) review: Approve - Данило Шеган (danilo) ------------------------------------------------------------ revno: 518 [merge] committer: Danilo Segan branch nick: trunk timestamp: Thu 2012-05-24 12:47:27 +0200 message: Use default values for Snowball u-boot-linaro-stable. Patch by Mathieu Poirier. 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 2012-03-21 14:14:56 +0000 +++ linaro_image_tools/media_create/android_boards.py 2012-05-16 20:27:29 +0000 @@ -199,11 +199,6 @@ 'earlyprintk mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=300M') _extra_serial_opts = 'console=ttyAMA2,115200n8' android_specific_args = 'init=/init androidboot.console=ttyAMA2' - # Snowball uses a custom uboot: - # it uses "fat load" instead of fatload and - # needs uImage/uInitrd prefixed with / - fatload_command = 'fat load' - uimage_path = '/' dtb_name = None @@ -215,11 +210,6 @@ _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 / - fatload_command = 'fat load' - uimage_path = '/' dtb_name = None @classmethod === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2012-05-09 21:25:20 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2012-05-24 10:47:27 +0000 @@ -1777,8 +1777,8 @@ 'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M ' 'mem=22M@360M mem_issw=1M@383M mem=640M@384M ' 'vmalloc=300M init=/init androidboot.console=ttyAMA2', - 'bootcmd': 'fat load mmc 1:1 0x00100000 /uImage; ' - 'fat load mmc 1:1 0x05000000 /uInitrd; ' + 'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; ' + 'fatload mmc 1:1 0x05000000 uInitrd; ' 'bootm 0x00100000 0x05000000'} self.assertBootEnv( android_boards.AndroidSnowballSdConfig, expected) @@ -1790,8 +1790,8 @@ 'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M ' 'mem=22M@360M mem_issw=1M@383M mem=640M@384M ' 'vmalloc=300M init=/init androidboot.console=ttyAMA2', - 'bootcmd': 'fat load mmc 0:2 0x00100000 /uImage; ' - 'fat load mmc 0:2 0x05000000 /uInitrd; ' + 'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; ' + 'fatload mmc 0:2 0x05000000 uInitrd; ' 'bootm 0x00100000 0x05000000'} self.assertBootEnv( android_boards.AndroidSnowballEmmcConfig, expected)