Merge lp:~berolinux/linaro-image-tools/mx6qsabrelite-bootargs into lp:linaro-image-tools/11.11

[Bernhard Rosenkraenzer]

New version of the Mx6QSabreLite bootargs patch - this time implemented completely inside android_boards.py

[Mattias Backman (mabac)]

Thanks for the update. I have a couple of more requests.

On Wed, Feb 29, 2012 at 3:34 PM, Bernhard Rosenkraenzer
<email address hidden> wrote:
> Bernhard Rosenkraenzer has proposed merging lp:~berolinux/linaro-image-tools/mx6qsabrelite-bootargs into lp:linaro-image-tools.
>
> Requested reviews:
>  Zach Pfeffer (pfefferz)
>  linaro-image-tools maintainers (linaro-image-tools)
>
> For more details, see:
> https://code.launchpad.net/~berolinux/linaro-image-tools/mx6qsabrelite-bootargs/+merge/95181
>
> New version of the Mx6QSabreLite bootargs patch - this time implemented completely inside android_boards.py
> --
> https://code.launchpad.net/~berolinux/linaro-image-tools/mx6qsabrelite-bootargs/+merge/95181
> You are subscribed to branch lp:linaro-image-tools.
>
> === modified file 'linaro_image_tools/media_create/android_boards.py'
> --- linaro_image_tools/media_create/android_boards.py   2012-02-21 08:01:08 +0000
> +++ linaro_image_tools/media_create/android_boards.py   2012-02-29 14:33:21 +0000
> @@ -296,13 +296,36 @@
>         install_mx5_boot_loader(os.path.join(boot_device_or_file, "u-boot.imx"), boot_partition, cls.LOADER_MIN_SIZE_S)
>
>
> -class AndroidMx6QSabreliteConfig(AndroidMx53LoCoConfig):
> +class AndroidMx6QSabreliteConfig(AndroidBoardConfig, Mx53LoCoConfig):
> +    serial_tty = 'ttymxc1'

This fails the test, could you please update that too? Please run
    testr init
    testr run

to make sure that the test suite succeeds before we merge this.

>     uboot_flavor = 'mx6qsabrelite'
>     kernel_addr = '0x10000000'
>     initrd_addr = '0x12000000'
>     load_addr = '0x10008000'
>     dtb_addr = '0x11ff0000'
>     dtb_name = 'board.dtb'
> +    extra_boot_args_options = (
> +        'earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve')
> +    _extra_serial_opts = 'console=%s,115200n8' % (
> +        serial_tty)
> +    android_specific_args = 'init=/init androidboot.console=%s' % (
> +        serial_tty)
> +
> +    @classmethod
> +    def get_sfdisk_cmd(cls, should_align_boot_part=False):
> +        loader_start, loader_end, loader_len = align_partition(
> +            1, cls.LOADER_MIN_SIZE_S, 1, PART_ALIGN_S)
> +
> +        command = super(AndroidMx6QSabreliteConfig, cls).get_sfdisk_cmd(
> +            should_align_boot_part=True, start_addr=loader_end,
> +            extra_part=True)
> +
> +        return '%s,%s,0xDA\n%s' % (
> +            loader_start, loader_len, command)
> +
> +    @classmethod
> +    def install_boot_loader(cls, boot_partition, boot_device_or_file):
> +        install_mx5_boot_loader(os.path.join(boot_device_or_file, "u-boot.imx"), boot_partition, cls.LOADER_MIN_SIZE_S)

Are these new functions identical to those on AndroidMx53LoCoConfig?
Could you find a way to avoid duplicating them, like ?

>
>
>  class AndroidSamsungConfig(AndroidBoardConfig):
>
>

[Mattias Backman (mabac)]

> Thanks for the update. I have a couple of more requests.
>
> On Wed, Feb 29, 2012 at 3:34 PM, Bernhard Rosenkraenzer
> <email address hidden> wrote:
> > Bernhard Rosenkraenzer has proposed merging lp:~berolinux/linaro-image-tools
> /mx6qsabrelite-bootargs into lp:linaro-image-tools.
> >
> > Requested reviews:
> >  Zach Pfeffer (pfefferz)
> >  linaro-image-tools maintainers (linaro-image-tools)
> >
> > For more details, see:
> > https://code.launchpad.net/~berolinux/linaro-image-tools/mx6qsabrelite-
> bootargs/+merge/95181
> >
> > New version of the Mx6QSabreLite bootargs patch - this time implemented
> completely inside android_boards.py
> > --
> > https://code.launchpad.net/~berolinux/linaro-image-tools/mx6qsabrelite-
> bootargs/+merge/95181
> > You are subscribed to branch lp:linaro-image-tools.
> >
> > === modified file 'linaro_image_tools/media_create/android_boards.py'
> > --- linaro_image_tools/media_create/android_boards.py   2012-02-21 08:01:08
> +0000
> > +++ linaro_image_tools/media_create/android_boards.py   2012-02-29 14:33:21
> +0000
> > @@ -296,13 +296,36 @@
> >         install_mx5_boot_loader(os.path.join(boot_device_or_file,
> "u-boot.imx"), boot_partition, cls.LOADER_MIN_SIZE_S)
> >
> >
> > -class AndroidMx6QSabreliteConfig(AndroidMx53LoCoConfig):
> > +class AndroidMx6QSabreliteConfig(AndroidBoardConfig, Mx53LoCoConfig):
> > +    serial_tty = 'ttymxc1'
>
> This fails the test, could you please update that too? Please run
> testr init
> testr run
>
> to make sure that the test suite succeeds before we merge this.
>
> >     uboot_flavor = 'mx6qsabrelite'
> >     kernel_addr = '0x10000000'
> >     initrd_addr = '0x12000000'
> >     load_addr = '0x10008000'
> >     dtb_addr = '0x11ff0000'
> >     dtb_name = 'board.dtb'
> > +    extra_boot_args_options = (
> > +        'earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve')
> > +    _extra_serial_opts = 'console=%s,115200n8' % (
> > +        serial_tty)
> > +    android_specific_args = 'init=/init androidboot.console=%s' % (
> > +        serial_tty)
> > +
> > +    @classmethod
> > +    def get_sfdisk_cmd(cls, should_align_boot_part=False):
> > +        loader_start, loader_end, loader_len = align_partition(
> > +            1, cls.LOADER_MIN_SIZE_S, 1, PART_ALIGN_S)
> > +
> > +        command = super(AndroidMx6QSabreliteConfig, cls).get_sfdisk_cmd(
> > +            should_align_boot_part=True, start_addr=loader_end,
> > +            extra_part=True)
> > +
> > +        return '%s,%s,0xDA\n%s' % (
> > +            loader_start, loader_len, command)
> > +
> > +    @classmethod
> > +    def install_boot_loader(cls, boot_partition, boot_device_or_file):
> > +        install_mx5_boot_loader(os.path.join(boot_device_or_file,
> "u-boot.imx"), boot_partition, cls.LOADER_MIN_SIZE_S)
>
> Are these new functions identical to those on AndroidMx53LoCoConfig?
> Could you find a way to avoid duplicating them, like ?

Like letting mx6 inherit the mx5 functions, was what I intended to write. :)

>
> >
> >
> >  class AndroidSamsungConfig(AndroidBoardConfig):
> >
> >

review: Needs Fixing

[Данило Шеган (danilo)]

No activity for a while: if you want to resurrect it, please address comments from Mattias, and then resubmit.

Unmerged revisions

497. By Bernhard Rosenkraenzer on 2012-02-29

Use the right bootargs for MX6QSabrelite

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2012-02-21 08:01:08 +0000
+++ linaro_image_tools/media_create/android_boards.py	2012-02-29 14:33:21 +0000
@@ -296,13 +296,36 @@
         install_mx5_boot_loader(os.path.join(boot_device_or_file, "u-boot.imx"), boot_partition, cls.LOADER_MIN_SIZE_S)
 
 
-class AndroidMx6QSabreliteConfig(AndroidMx53LoCoConfig):
+class AndroidMx6QSabreliteConfig(AndroidBoardConfig, Mx53LoCoConfig):
+    serial_tty = 'ttymxc1'
     uboot_flavor = 'mx6qsabrelite'
     kernel_addr = '0x10000000'
     initrd_addr = '0x12000000'
     load_addr = '0x10008000'
     dtb_addr = '0x11ff0000'
     dtb_name = 'board.dtb'
+    extra_boot_args_options = (
+        'earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve')
+    _extra_serial_opts = 'console=%s,115200n8' % (
+        serial_tty)
+    android_specific_args = 'init=/init androidboot.console=%s' % (
+        serial_tty)
+
+    @classmethod
+    def get_sfdisk_cmd(cls, should_align_boot_part=False):
+        loader_start, loader_end, loader_len = align_partition(
+            1, cls.LOADER_MIN_SIZE_S, 1, PART_ALIGN_S)
+
+        command = super(AndroidMx6QSabreliteConfig, cls).get_sfdisk_cmd(
+            should_align_boot_part=True, start_addr=loader_end,
+            extra_part=True)
+
+        return '%s,%s,0xDA\n%s' % (
+            loader_start, loader_len, command)
+
+    @classmethod
+    def install_boot_loader(cls, boot_partition, boot_device_or_file):
+        install_mx5_boot_loader(os.path.join(boot_device_or_file, "u-boot.imx"), boot_partition, cls.LOADER_MIN_SIZE_S)
 
 
 class AndroidSamsungConfig(AndroidBoardConfig):