diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 518: Use default values for Snowball u-boot-linaro-stable. Patch by Mathieu Poirier.

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

Commit Message

Данило Шеган May 24, 2012, 10:50 a.m. UTC 
Merge authors:
  Mathieu Poirier (mathieu.poirier)
Related merge proposals:
  https://code.launchpad.net/~mathieu.poirier/linaro-image-tools/linaro-image-tools.may15/+merge/105848
  proposed by: Mathieu Poirier (mathieu.poirier)
  review: Approve - Данило Шеган (danilo)
------------------------------------------------------------
revno: 518 [merge]
committer: Danilo Segan <danilo@canonical.com>
branch nick: trunk
timestamp: Thu 2012-05-24 12:47:27 +0200
message:
  Use default values for Snowball u-boot-linaro-stable.  Patch by Mathieu Poirier.
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	2012-03-21 14:14:56 +0000
+++ linaro_image_tools/media_create/android_boards.py	2012-05-16 20:27:29 +0000
@@ -199,11 +199,6 @@ 
         'earlyprintk mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=300M')
     _extra_serial_opts = 'console=ttyAMA2,115200n8'
     android_specific_args = 'init=/init androidboot.console=ttyAMA2'
-    # Snowball uses a custom uboot:
-    # it uses "fat load" instead of fatload and
-    # needs uImage/uInitrd prefixed with /
-    fatload_command = 'fat load'
-    uimage_path = '/'
     dtb_name = None
 
 
@@ -215,11 +210,6 @@ 
     _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 /
-    fatload_command = 'fat load'
-    uimage_path = '/'
     dtb_name = None
 
     @classmethod

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2012-05-09 21:25:20 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2012-05-24 10:47:27 +0000
@@ -1777,8 +1777,8 @@ 
                         'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
                         'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
                         'vmalloc=300M init=/init androidboot.console=ttyAMA2',
-            'bootcmd': 'fat load mmc 1:1 0x00100000 /uImage; '
-                       'fat load mmc 1:1 0x05000000 /uInitrd; '
+            'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; '
+                       'fatload mmc 1:1 0x05000000 uInitrd; '
                        'bootm 0x00100000 0x05000000'}
         self.assertBootEnv(
             android_boards.AndroidSnowballSdConfig, expected)
@@ -1790,8 +1790,8 @@ 
                         'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
                         'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
                         'vmalloc=300M init=/init androidboot.console=ttyAMA2',
-            'bootcmd': 'fat load mmc 0:2 0x00100000 /uImage; '
-                       'fat load mmc 0:2 0x05000000 /uInitrd; '
+            'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; '
+                       'fatload mmc 0:2 0x05000000 uInitrd; '
                        'bootm 0x00100000 0x05000000'}
         self.assertBootEnv(
             android_boards.AndroidSnowballEmmcConfig, expected)