Merge lp:~milo/linaro-image-tools/bug1095747 into lp:linaro-image-tools/11.11

[Milo Casagrande]

As reported on bug 1095747 comment #3, it should be sufficient to change the
MMC option for Snowball EMMC board to '0:2'.

Branch does that, and fixed a test.

[James Tunnicliffe (dooferlad)]

Looks good. Thanks.

review: Approve

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2013-03-26 09:08:58 +0000
+++ linaro_image_tools/media_create/boards.py	2013-04-03 11:48:23 +0000
@@ -1089,6 +1089,7 @@
         # puts the MBR, so the boot loader skips that address.
         self.supports_writing_to_mmc = False
         self.snowball_startup_files_config = 'startfiles.cfg'
+        self.mmc_option = '0:2'
 
     def get_v1_sfdisk_cmd(self, should_align_boot_part=None):
         """Return the sfdisk command to partition the media.
 
=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2013-03-26 08:59:38 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2013-04-03 11:48:23 +0000
@@ -2102,8 +2102,8 @@
                         'mem_modem=32M@96M mem=44M@128M pmem=22M@172M '
                         'mem=30M@194M mem_mali=32M@224M pmem_hwb=54M@256M '
                         'hwmem=48M@302M mem=152M@360M',
-            'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; '
-                       'fatload mmc 1:1 0x08000000 uInitrd; '
+            'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; '
+                       'fatload mmc 0:2 0x08000000 uInitrd; '
                        'bootm 0x00100000 0x08000000',
             'fdt_high': '0xffffffff',
             'initrd_high': '0xffffffff'}