[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 533: Increasing vmalloc pool to accommodate ioremap'ed devices and hwmem allocations. (LP: #1014650)

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

Commit Message

Fathi Boudra July 5, 2012, 5:58 a.m.
Merge authors:
  Mathieu Poirier (mathieu.poirier)
Related merge proposals:
  https://code.launchpad.net/~mathieu.poirier/linaro-image-tools/linaro-image-tools-LP1014650/+merge/113418
  proposed by: Mathieu Poirier (mathieu.poirier)
  review: Approve - Fathi Boudra (fboudra)
------------------------------------------------------------
revno: 533 [merge]
committer: Fathi Boudra <fathi.boudra@linaro.org>
branch nick: linaro-image-tools
timestamp: Thu 2012-07-05 08:57:00 +0300
message:
  Increasing vmalloc pool to accommodate ioremap'ed devices and hwmem allocations. (LP: #1014650)
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

Patch

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2012-06-25 07:18:02 +0000
+++ linaro_image_tools/media_create/android_boards.py	2012-07-04 15:30:34 +0000
@@ -204,7 +204,7 @@ 
     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=300M')
+        'mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=400M')
     _extra_serial_opts = 'console=ttyAMA2,115200n8'
     android_specific_args = 'init=/init androidboot.console=ttyAMA2'
     dtb_name = None
@@ -215,7 +215,7 @@ 
     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=300M')
+        'mem=22M@360M mem_issw=1M@383M mem=640M@384M vmalloc=400M')
     _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-06-25 07:18:02 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2012-07-04 15:30:34 +0000
@@ -1806,7 +1806,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=300M init=/init androidboot.console=ttyAMA2',
+                        'vmalloc=400M init=/init androidboot.console=ttyAMA2',
             'bootcmd': 'fatload mmc 1:1 0x00100000 uImage; '
                        'fatload mmc 1:1 0x05000000 uInitrd; '
                        'bootm 0x00100000 0x05000000'}
@@ -1819,7 +1819,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=300M init=/init androidboot.console=ttyAMA2',
+                        'vmalloc=400M init=/init androidboot.console=ttyAMA2',
             'bootcmd': 'fatload mmc 0:2 0x00100000 uImage; '
                        'fatload mmc 0:2 0x05000000 uInitrd; '
                        'bootm 0x00100000 0x05000000'}