diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 382: Set default display to give decent output where EDID probing isn't supported.

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

Commit Message

James Westby July 21, 2011, 7:51 p.m. UTC 
Merge authors:
  Andy Doan (doanac)
Related merge proposals:
  https://code.launchpad.net/~doanac/linaro-image-tools/overo-display-updates/+merge/68598
  proposed by: Andy Doan (doanac)
  review: Approve - Ricardo Salveti (rsalveti)
------------------------------------------------------------
revno: 382 [merge]
committer: James Westby <jw2328@jameswestby.net>
branch nick: trunk
timestamp: Thu 2011-07-21 15:49:45 -0400
message:
  Set default display to give decent output where EDID probing isn't supported.
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
diff mbox

Patch

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2011-07-05 18:43:01 +0000
+++ linaro_image_tools/media_create/boards.py	2011-07-19 22:19:43 +0000
@@ -612,7 +612,8 @@ 
     load_addr = '0x80008000'
     boot_script = 'boot.scr'
     extra_boot_args_options = (
-        'earlyprintk mpurate=${mpurate} vram=12M')
+        'earlyprintk mpurate=${mpurate} vram=12M '
+        'omapdss.def_disp=${defaultdisplay} omapfb.mode=dvi:${dvimode}')
 
 
 class PandaConfig(OmapConfig):

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-07-18 14:38:39 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-07-19 22:19:43 +0000
@@ -1247,7 +1247,9 @@ 
         expected = {
             'bootargs': 'console=tty0 console=ttyO2,115200n8  '
                         'root=UUID=deadbeef rootwait ro earlyprintk '
-                        'mpurate=${mpurate} vram=12M',
+                        'mpurate=${mpurate} vram=12M '
+                        'omapdss.def_disp=${defaultdisplay} '
+                        'omapfb.mode=dvi:${dvimode}',
             'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; '
                        'fatload mmc 0:1 0x81600000 uInitrd; '
                        'fatload mmc 0:1 0x815f0000 board.dtb; '