diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 489: Fix booting from emmc for Snowball by changing mmc partition. Thanks Benn Pörscke for fixing this.

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

Commit Message

Mattias Backman Feb. 1, 2012, 3:26 p.m. UTC 
Merge authors:
  Mattias Backman (mabac)
Related merge proposals:
  https://code.launchpad.net/~mabac/linaro-image-tools/bug-923650-snowball-android-emmc/+merge/91078
  proposed by: Mattias Backman (mabac)
  review: Approve - Benn Pörscke (bennporscke)
  review: Approve - Guilherme Salgado (salgado)
------------------------------------------------------------
revno: 489 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Wed 2012-02-01 16:24:13 +0100
message:
  Fix booting from emmc for Snowball by changing mmc partition. Thanks Benn Pörscke for fixing this.
modified:
  linaro_image_tools/media_create/android_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/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2011-12-22 14:24:17 +0000
+++ linaro_image_tools/media_create/android_boards.py	2012-02-01 13:49:49 +0000
@@ -207,6 +207,7 @@ 
         'earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M mem_issw=1M@383M mem=640M@384M vmalloc=256M')
     _extra_serial_opts = 'console=ttyAMA2,115200n8'
     android_specific_args = 'init=/init androidboot.console=ttyAMA2'
+    mmc_option = '0:2'
     # Snowball uses a custom uboot:
     # it uses "fat load" instead of fatload and
     # needs uImage/uInitrd prefixed with /

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2012-01-24 18:40:27 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2012-02-01 13:49:49 +0000
@@ -1522,8 +1522,8 @@ 
                         'mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M '
                         'mem=48M@328M mem_issw=1M@383M mem=640M@384M '
                         'vmalloc=256M init=/init androidboot.console=ttyAMA2',
-            'bootcmd': 'fat load mmc 1:1 0x00100000 /uImage; '
-                       'fat load mmc 1:1 0x05000000 /uInitrd; '
+            'bootcmd': 'fat load mmc 0:2 0x00100000 /uImage; '
+                       'fat load mmc 0:2 0x05000000 /uInitrd; '
                        'bootm 0x00100000 0x05000000'}
         self.assertEqual(expected, boot_commands)