diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 499: Set vmalloc to 300M for Snowball Android configs.

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

Commit Message

Mattias Backman March 12, 2012, 2:15 p.m. UTC 
Merge authors:
  Mathieu Poirier (mathieu.poirier)
Related merge proposals:
  https://code.launchpad.net/~mathieu.poirier/linaro-image-tools/vmalloc300/+merge/96236
  proposed by: Mathieu Poirier (mathieu.poirier)
------------------------------------------------------------
revno: 499 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Mon 2012-03-12 15:13:37 +0100
message:
  Set vmalloc to 300M for Snowball Android configs.
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-02-21 08:01:08 +0000
+++ linaro_image_tools/media_create/android_boards.py	2012-03-06 20:30:25 +0000
@@ -196,7 +196,7 @@ 
     boot_script = 'boot.scr'
     initrd_addr = '0x05000000'
     extra_boot_args_options = (
-        'earlyprintk mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=256M')
+        '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:
@@ -211,7 +211,7 @@ 
     boot_script = 'boot.scr'
     initrd_addr = '0x05000000'
     extra_boot_args_options = (
-        'earlyprintk mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=256M')
+        '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'
     mmc_option = '0:2'

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2012-02-21 08:44:42 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2012-03-06 20:30:25 +0000
@@ -1775,7 +1775,7 @@ 
                         'rootwait ro earlyprintk '
                         'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
                         'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
-                        'vmalloc=256M init=/init androidboot.console=ttyAMA2',
+                        'vmalloc=300M init=/init androidboot.console=ttyAMA2',
             'bootcmd': 'fat load mmc 1:1 0x00100000 /uImage; '
                        'fat load mmc 1:1 0x05000000 /uInitrd; '
                        'bootm 0x00100000 0x05000000'}
@@ -1788,7 +1788,7 @@ 
                         'rootwait ro earlyprintk '
                         'mem=128M@0 mali.mali_mem=64M@128M hwmem=168M@192M '
                         'mem=22M@360M mem_issw=1M@383M mem=640M@384M '
-                        'vmalloc=256M init=/init androidboot.console=ttyAMA2',
+                        'vmalloc=300M init=/init androidboot.console=ttyAMA2',
             'bootcmd': 'fat load mmc 0:2 0x00100000 /uImage; '
                        'fat load mmc 0:2 0x05000000 /uInitrd; '
                        'bootm 0x00100000 0x05000000'}