From patchwork Mon Dec 19 14:05:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 5878 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 2157223E03 for ; Mon, 19 Dec 2011 14:05:17 +0000 (UTC) Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by fiordland.canonical.com (Postfix) with ESMTP id F243EA18080 for ; Mon, 19 Dec 2011 14:05:16 +0000 (UTC) Received: by eeke52 with SMTP id e52so5781356eek.11 for ; Mon, 19 Dec 2011 06:05:16 -0800 (PST) Received: by 10.204.154.7 with SMTP id m7mr1501379bkw.71.1324303516654; Mon, 19 Dec 2011 06:05:16 -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.82.144 with SMTP id ac16cs6989bkc; Mon, 19 Dec 2011 06:05:16 -0800 (PST) Received: by 10.205.138.20 with SMTP id iq20mr1564617bkc.86.1324303514748; Mon, 19 Dec 2011 06:05:14 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id fx2si2863597wbb.139.2011.12.19.06.05.14 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 19 Dec 2011 06:05:14 -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 1Rcdq6-0006f2-E6 for ; Mon, 19 Dec 2011 14:05:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 608D3E1573 for ; Mon, 19 Dec 2011 14:05:14 +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: 478 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 478: Remove console=tty0 on mx53loco bootargs. (LP: #900460) Message-Id: <20111219140514.4035.64948.launchpad@ackee.canonical.com> Date: Mon, 19 Dec 2011 14:05:14 -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: 1d818353fe8c4f6ea3349d087489100818b87e3e Merge authors: Fathi Boudra (fboudra) Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~fboudra/linaro-image-tools/bug-900460-imx53/+merge/86208 proposed by: Fathi Boudra (fboudra) review: Approve - Mattias Backman (mabac) ------------------------------------------------------------ revno: 478 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Mon 2011-12-19 14:53:00 +0100 message: Remove console=tty0 on mx53loco bootargs. (LP: #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-15 16:39:01 +0000 +++ linaro_image_tools/media_create/android_boards.py 2011-12-19 09:57:46 +0000 @@ -234,7 +234,7 @@ class AndroidMx53LoCoConfig(AndroidBoardConfig, Mx53LoCoConfig): extra_boot_args_options = ( 'earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve') - _extra_serial_opts = 'console=tty0 console=%s,115200n8' % ( + _extra_serial_opts = 'console=%s,115200n8' % ( Mx53LoCoConfig.serial_tty) android_specific_args = 'init=/init androidboot.console=%s' % ( Mx53LoCoConfig.serial_tty) === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2011-12-15 16:38:05 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2011-12-19 13:51:23 +0000 @@ -1178,6 +1178,12 @@ '1843200,-,E\n1843200,1048576,L\n2891776,,,-', android_boards.AndroidVexpressA9Config.get_sfdisk_cmd()) + def test_mx5_android(self): + self.assertEqual( + '1,8191,0xDA\n8192,262144,0x0C,*\n270336,1048576,L\n' + '1318912,-,E\n1318912,524288,L\n1843200,1048576,L\n2891776,,,-', + android_boards.AndroidMx53LoCoConfig.get_sfdisk_cmd()) + class TestGetSfdiskCmdV2(TestCase): def test_mx5(self): @@ -1472,6 +1478,19 @@ 'bootm 0x60000000 0x62000000'} self.assertEqual(expected, boot_commands) + def test_android_mx5(self): + boot_commands = (android_boards.AndroidMx53LoCoConfig. + _get_boot_env(consoles=[])) + expected = { + 'bootargs': 'console=ttymxc0,115200n8 ' + 'rootwait ro earlyprintk rootdelay=1 fixrtc ' + 'nocompcache di1_primary tve init=/init ' + 'androidboot.console=ttymxc0', + 'bootcmd': 'fatload mmc 0:2 0x70000000 uImage; ' + 'fatload mmc 0:2 0x72000000 uInitrd; ' + 'bootm 0x70000000 0x72000000'} + self.assertEqual(expected, boot_commands) + class TestUnpackBinaryTarball(TestCaseWithFixtures):