[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 341: Merge lp:~asac/linaro-image-tools/panda-display-vram-24m; allocate more memory for Panda 1080p re...

Message ID 20110523143040.23678.11748.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Mattias Backman May 23, 2011, 2:30 p.m.
Merge authors:
  Alexander Sack (asac)
  Mattias Backman (mabac)
Related merge proposals:
  https://code.launchpad.net/~asac/linaro-image-tools/panda-display-vram-24m/+merge/61928
  proposed by: Alexander Sack (asac)
  review: Approve - Loïc Minier (lool)
  review: Needs Fixing - Mattias Backman (mabac)
------------------------------------------------------------
revno: 341 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Mon 2011-05-23 16:23:03 +0200
message:
  Merge lp:~asac/linaro-image-tools/panda-display-vram-24m; allocate more memory for Panda 1080p resolution.
modified:
  linaro_image_tools/media_create/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/boards.py'
--- linaro_image_tools/media_create/boards.py	2011-05-20 13:41:31 +0000
+++ linaro_image_tools/media_create/boards.py	2011-05-23 09:26:28 +0000
@@ -449,8 +449,8 @@ 
     load_addr = '0x80008000'
     boot_script = 'boot.scr'
     extra_boot_args_options = (
-        'earlyprintk fixrtc nocompcache vram=32M '
-        'omapfb.vram=0:8M mem=456M@0x80000000 mem=512M@0xA0000000')
+        'earlyprintk fixrtc nocompcache vram=48M '
+        'omapfb.vram=0:24M mem=456M@0x80000000 mem=512M@0xA0000000')
 
 
 class IgepConfig(BeagleConfig):

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-05-20 08:24:17 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-05-23 09:26:28 +0000
@@ -437,7 +437,7 @@ 
         expected = {
             'bootargs': 'console=tty0 console=ttyO2,115200n8  '
                         'root=UUID=deadbeef rootwait ro earlyprintk fixrtc '
-                        'nocompcache vram=32M omapfb.vram=0:8M '
+                        'nocompcache vram=48M omapfb.vram=0:24M '
                         'mem=456M@0x80000000 mem=512M@0xA0000000',
             'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; '
                        'fatload mmc 0:1 0x81600000 uInitrd; '