diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 490: snowball: android: Increasing mali memory to 64MB.

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

Commit Message

Mattias Backman Feb. 8, 2012, 10:51 p.m. UTC 
Merge authors:
  Mathieu Poirier (mathieu.poirier)
  Mattias Backman (mabac)
Related merge proposals:
  https://code.launchpad.net/~mathieu.poirier/linaro-image-tools/snowball-mali-64mb-memory/+merge/92131
  proposed by: Mathieu Poirier (mathieu.poirier)
------------------------------------------------------------
revno: 490 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Wed 2012-02-08 14:49:48 -0800
message:
  snowball: android: Increasing mali memory to 64MB.
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-01 13:49:49 +0000
+++ linaro_image_tools/media_create/android_boards.py	2012-02-08 19:34:27 +0000
@@ -190,7 +190,7 @@ 
     boot_script = 'boot.scr'
     initrd_addr = '0x05000000'
     extra_boot_args_options = (
-        'earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M 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=256M')
     _extra_serial_opts = 'console=ttyAMA2,115200n8'
     android_specific_args = 'init=/init androidboot.console=ttyAMA2'
     # Snowball uses a custom uboot:
@@ -204,7 +204,7 @@ 
     boot_script = 'boot.scr'
     initrd_addr = '0x05000000'
     extra_boot_args_options = (
-        'earlyprintk mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M mem=48M@328M 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=256M')
     _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-01 13:49:49 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2012-02-08 22:47:59 +0000
@@ -1505,8 +1505,8 @@ 
         expected = {
             'bootargs': 'console=ttyAMA2,115200n8 '
                         'rootwait ro earlyprintk '
-                        'mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M '
-                        'mem=48M@328M mem_issw=1M@383M mem=640M@384M '
+                        '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',
             'bootcmd': 'fat load mmc 1:1 0x00100000 /uImage; '
                        'fat load mmc 1:1 0x05000000 /uInitrd; '
@@ -1519,8 +1519,8 @@ 
         expected = {
             'bootargs': 'console=ttyAMA2,115200n8 '
                         'rootwait ro earlyprintk '
-                        'mem=128M@0 mali.mali_mem=32M@128M hwmem=168M@160M '
-                        'mem=48M@328M mem_issw=1M@383M mem=640M@384M '
+                        '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',
             'bootcmd': 'fat load mmc 0:2 0x00100000 /uImage; '
                        'fat load mmc 0:2 0x05000000 /uInitrd; '