Merge lp:~linaro-landing-team-samsung/linaro-image-tools/add-origen-android-support into lp:linaro-image-tools/11.11

[Angus Ainslie]

This branch adds Origen support to lianro-android-media-create

It also zero's the u-boot env area on the SD card so that an old env doesn't get used.

[Mattias Backman (mabac)]

The get_sfdisk functions in AndroidSMDKV310Config and AndroidOrigenConfig look identical to me, so I would like to see a AndroidSamsungConfig which both BoardConfigs inherit from to reduce duplication similar to what's been done in boards.py.

A few tests would also be nice, similar to those for the Panda and Snowball_emmc Android board configs.

review: Needs Fixing

[Mattias Backman (mabac)]

> === modified file 'linaro_image_tools/media_create/boards.py'
> --- linaro_image_tools/media_create/boards.py   2011-08-19 13:59:34 +0000
> +++ linaro_image_tools/media_create/boards.py   2011-08-22 17:31:41 +0000
> @@ -1049,7 +1049,10 @@
>
>     @classmethod
>     def populate_raw_partition(cls, chroot_dir, boot_device_or_file):
> -        # Populate created raw partition with BL1, env and u-boot
> +        # Zero the env so that the boot_script will get loaded
> +        _dd("/dev/zero", boot_device_or_file, count=SAMSUNG_V310_ENV_LEN,
> +            seek=SAMSUNG_V310_ENV_START)

If you're sure that this is ok for both Origen and SMDKV310, it's fine
by me. It will affect both boards, for Android and non-Android, but
all the other boards will be unaffected.

> +        # Populate created raw partition with BL1 and u-boot
>         spl_file = os.path.join(chroot_dir, 'boot', 'u-boot-mmc-spl.bin')
>         assert os.path.getsize(spl_file) <= (SAMSUNG_V310_BL1_LEN * SECTOR_SIZE), (
>             "%s is larger than SAMSUNG_V310_BL1_LEN" % spl_file)
>
>
>

[Angus Ainslie (angus-akkea)]

Hi Mathias

On Wed, Aug 24, 2011 at 2:40 AM, Mattias Backman
<email address hidden> wrote:
>> === modified file 'linaro_image_tools/media_create/boards.py'
>> --- linaro_image_tools/media_create/boards.py   2011-08-19 13:59:34 +0000
>> +++ linaro_image_tools/media_create/boards.py   2011-08-22 17:31:41 +0000
>> @@ -1049,7 +1049,10 @@
>>
>>     @classmethod
>>     def populate_raw_partition(cls, chroot_dir, boot_device_or_file):
>> -        # Populate created raw partition with BL1, env and u-boot
>> +        # Zero the env so that the boot_script will get loaded
>> +        _dd("/dev/zero", boot_device_or_file, count=SAMSUNG_V310_ENV_LEN,
>> +            seek=SAMSUNG_V310_ENV_START)
>
> If you're sure that this is ok for both Origen and SMDKV310, it's fine
> by me. It will affect both boards, for Android and non-Android, but
> all the other boards will be unaffected.
>

In the Android case the boot.scr should take over an in the Ubuntu
case the flashable_env will get written after this.

>> +        # Populate created raw partition with BL1 and u-boot
>>         spl_file = os.path.join(chroot_dir, 'boot', 'u-boot-mmc-spl.bin')
>>         assert os.path.getsize(spl_file) <= (SAMSUNG_V310_BL1_LEN * SECTOR_SIZE), (
>>             "%s is larger than SAMSUNG_V310_BL1_LEN" % spl_file)
>>
>>
>>
>
> --
> https://code.launchpad.net/~linaro-landing-team-samsung/linaro-image-tools/add-origen-android-support/+merge/72465
> Your team Linaro Landing Team: Samsung is subscribed to branch lp:~linaro-landing-team-samsung/linaro-image-tools/add-origen-android-support.
>

--
Angus Ainslie <email address hidden>
Team Lead, Samsung Landing Team

[Mattias Backman (mabac)]

Refactoring and tests added in lp:~mabac/linaro-image-tools/add-origen-android-support which has been tested by rsalveti and botao.

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2011-08-04 13:58:02 +0000
+++ linaro_image_tools/media_create/android_boards.py	2011-08-22 17:31:41 +0000
@@ -35,6 +35,7 @@
 from linaro_image_tools.media_create.boards import SnowballSdConfig
 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 (
     align_up,
     align_partition,
@@ -266,6 +267,27 @@
             loader_start, loader_len, command)
 
 
+class AndroidOrigenConfig(AndroidBoardConfig, OrigenConfig):
+    _extra_serial_opts = 'console=tty0 console=ttySAC2,115200n8'
+    android_specific_args = 'init=/init androidboot.console=ttySAC2'
+
+    @classmethod
+    def get_sfdisk_cmd(cls, should_align_boot_part=False):
+        loaders_min_len = (
+            SAMSUNG_V310_BL2_START + SAMSUNG_V310_BL2_LEN -
+            SAMSUNG_V310_BL1_START)
+
+        loader_start, loader_end, loader_len = align_partition(
+            1, loaders_min_len, 1, PART_ALIGN_S)
+
+        command = super(AndroidOrigenConfig, cls).get_sfdisk_cmd(
+            should_align_boot_part=False, start_addr=loader_end,
+            extra_part=True)
+
+        return '%s,%s,0xDA\n%s' % (
+            loader_start, loader_len, command)
+
+
 android_board_configs = {
     'beagle': AndroidBeagleConfig,
     'panda': AndroidPandaConfig,
@@ -273,4 +295,5 @@
     'snowball_emmc': AndroidSnowballEmmcConfig,
     'smdkv310': AndroidSMDKV310Config,
     'iMX53': AndroidMx53LoCoConfig,
+    'origen': AndroidOrigenConfig,
     }

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2011-08-19 13:59:34 +0000
+++ linaro_image_tools/media_create/boards.py	2011-08-22 17:31:41 +0000
@@ -1049,7 +1049,10 @@
 
     @classmethod
     def populate_raw_partition(cls, chroot_dir, boot_device_or_file):
-        # Populate created raw partition with BL1, env and u-boot
+        # Zero the env so that the boot_script will get loaded
+        _dd("/dev/zero", boot_device_or_file, count=SAMSUNG_V310_ENV_LEN,
+            seek=SAMSUNG_V310_ENV_START)
+        # Populate created raw partition with BL1 and u-boot
         spl_file = os.path.join(chroot_dir, 'boot', 'u-boot-mmc-spl.bin')
         assert os.path.getsize(spl_file) <= (SAMSUNG_V310_BL1_LEN * SECTOR_SIZE), (
             "%s is larger than SAMSUNG_V310_BL1_LEN" % spl_file)