From patchwork Thu Dec 15 17:47:20 2011 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: 5780 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 B6EA923E0E for ; Thu, 15 Dec 2011 17:47:22 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id A48D7A18236 for ; Thu, 15 Dec 2011 17:47:22 +0000 (UTC) Received: by eaak10 with SMTP id k10so2538142eaa.11 for ; Thu, 15 Dec 2011 09:47:22 -0800 (PST) Received: by 10.205.129.137 with SMTP id hi9mr1836065bkc.90.1323971242377; Thu, 15 Dec 2011 09:47:22 -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.205.129.2 with SMTP id hg2cs48420bkc; Thu, 15 Dec 2011 09:47:22 -0800 (PST) Received: by 10.205.122.133 with SMTP id gg5mr1799831bkc.65.1323971240873; Thu, 15 Dec 2011 09:47:20 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id eo20si4330329wbb.73.2011.12.15.09.47.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Dec 2011 09:47:20 -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 1RbFOq-0003pN-JH for ; Thu, 15 Dec 2011 17:47:20 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 86528E002A for ; Thu, 15 Dec 2011 17:47:20 +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: 474 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 474: [r=salgado] Do not pass console=tty0 in the bootargs for PandaBoard AndroidConfig. Fixes #900460. Message-Id: <20111215174720.5207.88492.launchpad@ackee.canonical.com> Date: Thu, 15 Dec 2011 17:47:20 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14487"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 9872988c68c558e156247f9f60f1929e58ce64c8 Merge authors: Данило Шеган (danilo) Related merge proposals: https://code.launchpad.net/~danilo/linaro-image-tools/bug-900460-panda/+merge/85908 proposed by: Данило Шеган (danilo) review: Approve - Guilherme Salgado (salgado) ------------------------------------------------------------ revno: 474 [merge] committer: Danilo Segan branch nick: trunk timestamp: Thu 2011-12-15 18:45:39 +0100 message: [r=salgado] Do not pass console=tty0 in the bootargs for PandaBoard AndroidConfig. Fixes #900460. 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-05 19:53:49 +0000 +++ linaro_image_tools/media_create/android_boards.py 2011-12-15 16:39:01 +0000 @@ -179,7 +179,7 @@ class AndroidPandaConfig(AndroidOmapConfig, PandaConfig): - _extra_serial_opts = 'console=tty0 console=ttyO2,115200n8' + _extra_serial_opts = 'console=ttyO2,115200n8' extra_boot_args_options = ( 'earlyprintk fixrtc nocompcache vram=48M ' 'omapfb.vram=0:24M,1:24M mem=456M@0x80000000 mem=512M@0xA0000000') === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-12-05 19:53:49 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-12-15 16:38:05 +0000 @@ -1412,7 +1412,7 @@ config.serial_tty = config._serial_tty boot_commands = config._get_boot_env(consoles=[]) expected = { - 'bootargs': 'console=tty0 console=ttyO2,115200n8 ' + 'bootargs': 'console=ttyO2,115200n8 ' 'rootwait ro earlyprintk fixrtc ' 'nocompcache vram=48M omapfb.vram=0:24M,1:24M ' 'mem=456M@0x80000000 mem=512M@0xA0000000 '