diff mbox

[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
State Accepted
Headers show

Commit Message

Mattias Backman March 22, 2012, 7:49 a.m. UTC 
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 <mattias.backman@linaro.org>
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
diff mbox

Patch

=== 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 = {