> 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): > > > >
« Back to merge proposal
> Thanks for the update. I have a couple of more requests. bootargs into lp:linaro-image-tools. image-tools) /code.launchpad .net/~berolinux /linaro- image-tools/ mx6qsabrelite- +merge/ 95181 /code.launchpad .net/~berolinux /linaro- image-tools/ mx6qsabrelite- +merge/ 95181 image_tools/ media_create/ android_ boards. py' image_tools/ media_create/ android_ boards. py 2012-02-21 08:01:08 image_tools/ media_create/ android_ boards. py 2012-02-29 14:33:21 mx5_boot_ loader( os.path. join(boot_ device_ or_file, MIN_SIZE_ S) eliteConfig( AndroidMx53LoCo Config) : eliteConfig( AndroidBoardCon fig, Mx53LoCoConfig): args_options = ( %s,115200n8' % ( specific_ args = 'init=/init androidboot. console= %s' % ( align_boot_ part=False) : MIN_SIZE_ S, 1, PART_ALIGN_S) 6QSabreliteConf ig, cls).get_ sfdisk_ cmd( align_boot_ part=True, start_addr= loader_ end, boot_loader( cls, boot_partition, boot_device_ or_file) : mx5_boot_ loader( os.path. join(boot_ device_ or_file, MIN_SIZE_ S) Config?
>
> 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-
> >
> > Requested reviews:
> > Zach Pfeffer (pfefferz)
> > linaro-image-tools maintainers (linaro-
> >
> > For more details, see:
> > https:/
> bootargs/
> >
> > New version of the Mx6QSabreLite bootargs patch - this time implemented
> completely inside android_boards.py
> > --
> > https:/
> bootargs/
> > You are subscribed to branch lp:linaro-image-tools.
> >
> > === modified file 'linaro_
> > --- linaro_
> +0000
> > +++ linaro_
> +0000
> > @@ -296,13 +296,36 @@
> > install_
> "u-boot.imx"), boot_partition, cls.LOADER_
> >
> >
> > -class AndroidMx6QSabr
> > +class AndroidMx6QSabr
> > + 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_
> > + 'earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve')
> > + _extra_serial_opts = 'console=
> > + serial_tty)
> > + android_
> > + serial_tty)
> > +
> > + @classmethod
> > + def get_sfdisk_cmd(cls, should_
> > + loader_start, loader_end, loader_len = align_partition(
> > + 1, cls.LOADER_
> > +
> > + command = super(AndroidMx
> > + should_
> > + extra_part=True)
> > +
> > + return '%s,%s,0xDA\n%s' % (
> > + loader_start, loader_len, command)
> > +
> > + @classmethod
> > + def install_
> > + install_
> "u-boot.imx"), boot_partition, cls.LOADER_
>
> Are these new functions identical to those on AndroidMx53LoCo
> Could you find a way to avoid duplicating them, like ?
Like letting mx6 inherit the mx5 functions, was what I intended to write. :)
> onfig(AndroidBo ardConfig) :
> >
> >
> > class AndroidSamsungC
> >
> >