Merge lp:~tixy/linaro-image-tools/vexpress-a9-support into lp:linaro-image-tools/11.11

[Tixy (Jon Medhurst)]

This is the same as my previous merge proposal but with test cases added, including for Android.

[Mattias Backman (mabac)]

Thanks for adding the tests. We do also need the Android test cases. Can you have a look at TestGetBootCmdAndroid and TestGetSfdiskCmd and add a corresponding test method for the Vexpress as well?

[Tixy (Jon Medhurst) (tixy)]

On Wed, 2011-11-16 at 13:56 +0000, Mattias Backman wrote:
> Thanks for adding the tests. We do also need the Android test cases. Can you have a look at TestGetBootCmdAndroid and TestGetSfdiskCmd and add a corresponding test method for the Vexpress as well?

I will do that. What is the best way, commit another change and push
that out? Or modify the existing change?

--
Tixy

[Mattias Backman (mabac)]

On Wed, Nov 16, 2011 at 3:04 PM, Tixy (Jon Medhurst)
<email address hidden> wrote:
> On Wed, 2011-11-16 at 13:56 +0000, Mattias Backman wrote:
>> Thanks for adding the tests. We do also need the Android test cases. Can you have a look at TestGetBootCmdAndroid and TestGetSfdiskCmd and add a corresponding test method for the Vexpress as well?
>
> I will do that. What is the best way, commit another change and push
> that out? Or modify the existing change?

Just commit another revision and push to the branch. Bazaar should
have remembered the target so you can do
   bzr push
and if that does not work do
   bzr push lp:~tixy/etc/etc --remember
so it will be remembered for next time.

Then put a comment in the merge proposal since I don't think there's
any notification for new revisions.

>
> --
> Tixy
>
>
> https://code.launchpad.net/~tixy/linaro-image-tools/vexpress-a9-support/+merge/82372
> You are requested to review the proposed merge of lp:~tixy/linaro-image-tools/vexpress-a9-support into lp:linaro-image-tools.
>

[lp:~tixy/linaro-image-tools/vexpress-a9-support]

462. By Tixy (Jon Medhurst) on 2011-11-16

Add vexpress-a9 test case for android.

[Tixy (Jon Medhurst) (tixy)]

On Wed, 2011-11-16 at 14:29 +0000, Mattias Backman wrote:
> On Wed, Nov 16, 2011 at 3:04 PM, Tixy (Jon Medhurst)
> <email address hidden> wrote:
> > On Wed, 2011-11-16 at 13:56 +0000, Mattias Backman wrote:
> >> Thanks for adding the tests. We do also need the Android test cases. Can you have a look at TestGetBootCmdAndroid and TestGetSfdiskCmd and add a corresponding test method for the Vexpress as well?
> >
> > I will do that. What is the best way, commit another change and push
> > that out? Or modify the existing change?
>
> Just commit another revision and push to the branch. Bazaar should
> have remembered the target so you can do
> bzr push
> and if that does not work do
> bzr push lp:~tixy/etc/etc --remember
> so it will be remembered for next time.
>
> Then put a comment in the merge proposal since I don't think there's
> any notification for new revisions.

I've done that, thanks. For planning purposes, what is the likelyhood
that this change would be in the tools in time for a vexpress Android
release this month? (I'm guessing it's a bit late now.)

--
Tixy

[Mattias Backman (mabac)]

Thanks for the additional tests.

> I've done that, thanks. For planning purposes, what is the likelyhood
> that this change would be in the tools in time for a vexpress Android
> release this month? (I'm guessing it's a bit late now.)

I'd say that there's a very good chance to have this in the next release of l-i-t. :) That is, I'll have another look and probably find that I'm still happy with it and merge it before we cut the release.

>
> --
> Tixy

[Mattias Backman (mabac)]

Thank you for working on this and adding the test cases. I have merged the change so it will be part of the next release.

review: Approve

[Tixy (Jon Medhurst) (tixy)]

On Thu, 2011-11-17 at 09:07 +0000, Mattias Backman wrote:
> Review: Approve
>
> Thank you for working on this and adding the test cases. I have merged the change so it will be part of the next release.

Thanks :-)

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2011-11-14 15:14:29 +0000
+++ linaro_image_tools/media_create/android_boards.py	2011-11-16 14:37:01 +0000
@@ -33,6 +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 (
     align_up,
     align_partition,
@@ -282,6 +283,11 @@
     android_specific_args = 'init=/init androidboot.console=ttySAC2'
 
 
+class AndroidVexpressA9Config(AndroidBoardConfig, VexpressA9Config):
+    _extra_serial_opts = 'console=tty0 console=ttyAMA0,38400n8'
+    android_specific_args = 'init=/init androidboot.console=ttyAMA0'
+
+
 android_board_configs = {
     'beagle': AndroidBeagleConfig,
     'panda': AndroidPandaConfig,
@@ -291,4 +297,5 @@
     'mx53loco': AndroidMx53LoCoConfig,
     'iMX53': AndroidMx53LoCoConfig,
     'origen': AndroidOrigenConfig,
+    'vexpress-a9': AndroidVexpressA9Config,
     }
 
=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2011-11-09 17:39:45 +0000
+++ linaro_image_tools/media_create/boards.py	2011-11-16 14:37:01 +0000
@@ -1266,7 +1266,7 @@
     initrd_addr = '0x81000000'
     load_addr = kernel_addr
     kernel_flavors = ['linaro-vexpress']
-    boot_script = None
+    boot_script = 'boot.scr'
     # ARM Boot Monitor is used to load u-boot, uImage etc. into flash and
     # only allows for FAT16
     fat_size = 16
@@ -1287,6 +1287,13 @@
         make_uInitrd(i_img_data, boot_dir)
 
 
+class VexpressA9Config(VexpressConfig):
+    # For now, this is a duplicate of VexpressConfig.
+    # In future, there will also be A5 and A15 variants.
+    # For all of these, there should never be any V1 hardware packs.
+    pass
+
+
 class SamsungConfig(BoardConfig):
     @classproperty
     def extra_serial_opts(cls):
@@ -1430,6 +1437,7 @@
     'igep': IgepConfig,
     'panda': PandaConfig,
     'vexpress': VexpressConfig,
+    'vexpress-a9': VexpressA9Config,
     'ux500': Ux500Config,
     'snowball_sd': SnowballSdConfig,
     'snowball_emmc': SnowballEmmcConfig,
 
=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-11-15 08:07:46 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-11-16 14:37:01 +0000
@@ -919,6 +919,11 @@
         expected = ['make_uImage', 'make_uInitrd']
         self.assertEqual(expected, self.funcs_calls)
 
+    def test_vexpress_a9_steps(self):
+        self.make_boot_files(boards.VexpressA9Config)
+        expected = ['make_uImage', 'make_uInitrd']
+        self.assertEqual(expected, self.funcs_calls)
+
     def test_mx5_steps(self):
         class SomeMx5Config(boards.Mx5Config):
             uboot_flavor = 'uboot_flavor'
@@ -1224,6 +1229,18 @@
                        'bootm 0x60008000 0x81000000'}
         self.assertEqual(expected, boot_commands)
 
+    def test_vexpress_a9(self):
+        boot_commands = board_configs['vexpress-a9']._get_boot_env(
+            is_live=False, is_lowmem=False, consoles=['ttyXXX'],
+            rootfs_uuid="deadbeef", d_img_data=None)
+        expected = {
+            'bootargs': 'console=tty0 console=ttyAMA0,38400n8 '
+                        'console=ttyXXX  root=UUID=deadbeef rootwait ro',
+            'bootcmd': 'fatload mmc 0:1 0x60008000 uImage; '
+                       'fatload mmc 0:1 0x81000000 uInitrd; '
+                       'bootm 0x60008000 0x81000000'}
+        self.assertEqual(expected, boot_commands)
+
     def test_mx51(self):
         boot_commands = boards.Mx51Config._get_boot_env(
             is_live=False, is_lowmem=False, consoles=[],
@@ -1436,6 +1453,17 @@
                        'bootm 0x40007000 0x42000000'}
         self.assertEqual(expected, boot_commands)
 
+    def test_android_vexpress_a9(self):
+        boot_commands = (android_boards.AndroidVexpressA9Config.
+                         _get_boot_env(consoles=[]))
+        expected = {
+            'bootargs': 'console=tty0 console=ttyAMA0,38400n8 '
+                        'rootwait ro init=/init androidboot.console=ttyAMA0',
+            'bootcmd': 'fatload mmc 0:1 0x60008000 uImage; '
+                       'fatload mmc 0:1 0x81000000 uInitrd; '
+                       'bootm 0x60008000 0x81000000'}
+        self.assertEqual(expected, boot_commands)
+
 
 class TestUnpackBinaryTarball(TestCaseWithFixtures):