diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 618: Changed MMC option for Snowball EMMC board.

Message ID 20130403151314.26475.65357.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Milo Casagrande April 3, 2013, 3:13 p.m. UTC 
Merge authors:
  Milo Casagrande (milo)
Related merge proposals:
  https://code.launchpad.net/~milo/linaro-image-tools/bug1095747/+merge/156815
  proposed by: Milo Casagrande (milo)
  review: Approve - James Tunnicliffe (dooferlad)
------------------------------------------------------------
revno: 618 [merge]
committer: Milo Casagrande <milo@ubuntu.com>
branch nick: trunk
timestamp: Wed 2013-04-03 17:12:24 +0200
message:
  Changed MMC option for Snowball EMMC board.
modified:
  linaro_image_tools/media_create/boards.py
  linaro_image_tools/media_create/tests/test_media_create.py


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2013-04-03 11:32:40 +0000
+++ linaro_image_tools/media_create/boards.py	2013-04-03 15:12:24 +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-04-03 11:32:40 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2013-04-03 15:12:24 +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'}