diff mbox

[Branch,~linaro-maintainers/linaro-image-tools/trunk] Rev 316: Merge lp:~hrw/linaro-image-tools/more-ram-for-pandaboard; gives more RAM on

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

Commit Message

Loïc Minier April 7, 2011, 8:48 p.m. UTC 
Merge authors:
  Marcin Juszkiewicz (hrw)
Related merge proposals:
  https://code.launchpad.net/~hrw/linaro-image-tools/more-ram-for-pandaboard/+merge/56602
  proposed by: Marcin Juszkiewicz (hrw)
  review: Approve - Loïc Minier (lool)
------------------------------------------------------------
revno: 316 [merge]
committer: Loïc Minier <lool@dooz.org>
branch nick: linaro-image-tools
timestamp: Thu 2011-04-07 22:46:11 +0200
message:
  Merge lp:~hrw/linaro-image-tools/more-ram-for-pandaboard; gives more RAM on
  Panda boards; LP: #707047.
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-maintainers/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-maintainers/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2011-04-06 12:54:22 +0000
+++ linaro_image_tools/media_create/boards.py	2011-04-07 20:46:11 +0000
@@ -475,7 +475,7 @@ 
     boot_script = 'boot.scr'
     extra_boot_args_options = (
         'earlyprintk fixrtc nocompcache vram=32M '
-        'omapfb.vram=0:8M mem=463M ip=none')
+        'omapfb.vram=0:8M mem=463M@0x80000000 mem=512M@0xA0000000 ip=none')
 
 
 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-04-06 12:54:22 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-04-07 20:46:11 +0000
@@ -403,8 +403,8 @@ 
         expected = {
             'bootargs': 'console=tty0 console=ttyO2,115200n8  '
                         'root=UUID=deadbeef rootwait ro earlyprintk fixrtc '
-                        'nocompcache vram=32M omapfb.vram=0:8M mem=463M '
-                        'ip=none',
+                        'nocompcache vram=32M omapfb.vram=0:8M '
+                        'mem=463M@0x80000000 mem=512M@0xA0000000 ip=none',
             'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; '
                        'fatload mmc 0:1 0x81600000 uInitrd; '
                        'bootm 0x80200000 0x81600000'}