From patchwork Thu Mar 22 07:49:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 7400 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 6819A23E13 for ; Thu, 22 Mar 2012 07:49:12 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 085A2A183D3 for ; Thu, 22 Mar 2012 07:49:11 +0000 (UTC) Received: by iage36 with SMTP id e36so3659209iag.11 for ; Thu, 22 Mar 2012 00:49:11 -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=p0u9UbLjHhsBt2ti5wFShNXpElA9eo514Sj+YgMgaAw=; b=kdWdGpVMs7zMUEoaXPp0oG3gc0ZknBbiizjXveA9L2EaBl5ZQwWC6cJLhjPsgKN9Ie W3LX7zUex0c61LG2eher4FWvieqyP4tn5yRTokqVgnHzhkWK4UVGtWpOLIu5Y8mPrZul d3CDXLmDef4pn0rjSYWiCF/6ykxoeZdWm0pfdX8h0+Ap2KAk/1IXUrxu+Xnm+YbUSrhL 0tp3T5YIJRs3cXIF+NP+hTvxCW6ycllAx1qx93s7KrpL1MEYk3vDHPJgXscVDQBW/uNo PeXVAaKrj3BjfwHADBPW9WBKjnVtZvLiLj1eGPdY4ErvtwT2Ejq9UuVuypyLA5k5Xx5i 4jNg== Received: by 10.42.72.130 with SMTP id o2mr4642945icj.8.1332402551469; Thu, 22 Mar 2012 00:49:11 -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.203.79 with SMTP id fh15csp41502ibb; Thu, 22 Mar 2012 00:49:10 -0700 (PDT) Received: by 10.180.103.35 with SMTP id ft3mr2761842wib.0.1332402550324; Thu, 22 Mar 2012 00:49:10 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id b62si4267567wed.47.2012.03.22.00.49.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Mar 2012 00:49:10 -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 1SAclh-00077s-OW for ; Thu, 22 Mar 2012 07:49:09 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id AFF26E01EE for ; Thu, 22 Mar 2012 07:49:09 +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: 501 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 501: Rename AndroidVexpressA9Config to AndroidVexpressConfig and add vexpress --dev option to l-a-m-c. Message-Id: <20120322074909.12561.63762.launchpad@ackee.canonical.com> Date: Thu, 22 Mar 2012 07:49:09 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14981"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: ad33355ab56628d0588c0c6e9bc915f225ca0a2e X-Gm-Message-State: ALoCoQkcNKQikzOyNrU2fnjk4tWExYYFsXeHl4rW4L/61KKCe/P4rTpO1OLG/GIuc9hhoY+4E99s Merge authors: Tixy (Jon Medhurst) (tixy) Related merge proposals: https://code.launchpad.net/~tixy/linaro-image-tools/android-vexpress-a9-rename/+merge/98643 proposed by: Tixy (Jon Medhurst) (tixy) review: Approve - Loïc Minier (lool) ------------------------------------------------------------ revno: 501 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Thu 2012-03-22 08:47:51 +0100 message: Rename AndroidVexpressA9Config to AndroidVexpressConfig and add vexpress --dev option to l-a-m-c. 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-06 20:30:25 +0000 +++ linaro_image_tools/media_create/android_boards.py 2012-03-21 14:14:56 +0000 @@ -33,7 +33,7 @@ from linaro_image_tools.media_create.boards import SnowballEmmcConfig from linaro_image_tools.media_create.boards import SMDKV310Config from linaro_image_tools.media_create.boards import OrigenConfig -from linaro_image_tools.media_create.boards import VexpressA9Config +from linaro_image_tools.media_create.boards import VexpressConfig from linaro_image_tools.media_create.boards import ( align_up, align_partition, @@ -337,7 +337,7 @@ dtb_name = None -class AndroidVexpressA9Config(AndroidBoardConfig, VexpressA9Config): +class AndroidVexpressConfig(AndroidBoardConfig, VexpressConfig): _extra_serial_opts = 'console=tty0 console=ttyAMA0,38400n8' android_specific_args = 'init=/init androidboot.console=ttyAMA0' dtb_name = None @@ -353,5 +353,6 @@ 'iMX53': AndroidMx53LoCoConfig, 'mx6qsabrelite': AndroidMx6QSabreliteConfig, 'origen': AndroidOrigenConfig, - 'vexpress-a9': AndroidVexpressA9Config, + 'vexpress': AndroidVexpressConfig, + 'vexpress-a9': AndroidVexpressConfig, } === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2012-03-06 20:30:25 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2012-03-21 14:14:56 +0000 @@ -1285,8 +1285,8 @@ self.assertEqual(expected_commands, fixture.mock.commands_executed) self.assertEqual(expected, self.funcs_calls) - def test_vexpress_a9_raw(self): - self.populate_raw_partition(android_boards.AndroidVexpressA9Config) + def test_vexpress_raw(self): + self.populate_raw_partition(android_boards.AndroidVexpressConfig) expected = [] self.assertEqual(expected, self.funcs_calls) @@ -1443,7 +1443,7 @@ self.assertEqual( '63,270272,0x0E,*\n270336,1048576,L\n1318912,524288,L\n' '1843200,-,E\n1843200,1048576,L\n2891776,,,-', - android_boards.AndroidVexpressA9Config.get_sfdisk_cmd()) + android_boards.AndroidVexpressConfig.get_sfdisk_cmd()) def test_mx5_android(self): self.assertEqual( @@ -1805,7 +1805,7 @@ self.assertBootEnv( android_boards.AndroidOrigenConfig, expected) - def test_android_vexpress_a9(self): + def test_android_vexpress(self): expected = { 'bootargs': 'console=tty0 console=ttyAMA0,38400n8 ' 'rootwait ro init=/init androidboot.console=ttyAMA0', @@ -1813,7 +1813,7 @@ 'fatload mmc 0:1 0x62000000 uInitrd; ' 'bootm 0x60000000 0x62000000'} self.assertBootEnv( - android_boards.AndroidVexpressA9Config, expected) + android_boards.AndroidVexpressConfig, expected) def test_android_mx5(self): expected = {