[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 346: Merge lp:~rsalveti/linaro-image-tools/beagle-mpurate; Add mpurate=${mpurate} kernel boot argument...

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

Commit Message

Mattias Backman May 24, 2011, 7 a.m.
Merge authors:
  Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Related merge proposals:
  https://code.launchpad.net/~rsalveti/linaro-image-tools/beagle-mpurate/+merge/62070
  proposed by: Ricardo Salveti (rsalveti)
  review: Approve - Mattias Backman (mabac)
------------------------------------------------------------
revno: 346 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Tue 2011-05-24 08:57:08 +0200
message:
  Merge lp:~rsalveti/linaro-image-tools/beagle-mpurate; Add mpurate=${mpurate} kernel boot argument for Beagle Board.
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-23 14:24:24 +0000
+++ linaro_image_tools/media_create/boards.py	2011-05-24 02:22:47 +0000
@@ -419,7 +419,7 @@ 
     boot_script = 'boot.scr'
     extra_boot_args_options = (
         'earlyprintk fixrtc nocompcache vram=12M '
-        'omapfb.mode=dvi:1280x720MR-16@60')
+        'omapfb.mode=dvi:1280x720MR-16@60 mpurate=${mpurate}')
 
 
 class OveroConfig(OmapConfig):

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-05-23 14:24:24 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-05-24 02:22:47 +0000
@@ -458,7 +458,7 @@ 
             'bootargs': 'console=tty0 console=ttyO2,115200n8  '
                         'root=UUID=deadbeef rootwait ro earlyprintk fixrtc '
                         'nocompcache vram=12M '
-                        'omapfb.mode=dvi:1280x720MR-16@60',
+                        'omapfb.mode=dvi:1280x720MR-16@60 mpurate=${mpurate}',
             'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; '
                        'fatload mmc 0:1 0x81600000 uInitrd; '
                        'fatload mmc 0:1 0x815f0000 board.dtb; '
@@ -478,7 +478,7 @@ 
             'bootargs': 'console=tty0 console=ttyO2,115200n8  '
                         'root=UUID=deadbeef rootwait ro earlyprintk fixrtc '
                         'nocompcache vram=12M '
-                        'omapfb.mode=dvi:1280x720MR-16@60',
+                        'omapfb.mode=dvi:1280x720MR-16@60 mpurate=${mpurate}',
             'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; '
                        'fatload mmc 0:1 0x81600000 uInitrd; '
                        'fatload mmc 0:1 0x815f0000 board.dtb; '