[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 342: Merge lp:~doanac/linaro-image-tools/overo-updates; clean up no longer needed video settings for O...

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

Commit Message

Mattias Backman May 23, 2011, 2:30 p.m.
Merge authors:
  Andy Doan (doanac)
Related merge proposals:
  https://code.launchpad.net/~doanac/linaro-image-tools/overo-updates/+merge/61789
  proposed by: Andy Doan (doanac)
  review: Approve - Loïc Minier (lool)
------------------------------------------------------------
revno: 342 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Mon 2011-05-23 16:24:24 +0200
message:
  Merge lp:~doanac/linaro-image-tools/overo-updates; clean up no longer needed video settings for Overo.
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 09:26:28 +0000
+++ linaro_image_tools/media_create/boards.py	2011-05-23 14:24:24 +0000
@@ -270,7 +270,7 @@ 
         boot_env = cls._get_boot_env(is_live, is_lowmem, consoles, rootfs_uuid,
                                      d_img_data)
         cls._make_boot_files(
-            boot_env, chroot_dir, boot_dir, 
+            boot_env, chroot_dir, boot_dir,
             boot_device_or_file, k_img_data, i_img_data, d_img_data)
 
     @classmethod
@@ -433,8 +433,7 @@ 
     load_addr = '0x80008000'
     boot_script = 'boot.scr'
     extra_boot_args_options = (
-        'earlyprintk mpurate=500 vram=12M '
-        'omapfb.mode=dvi:1024x768MR-16@60 omapdss.def_disp=dvi')
+        'earlyprintk mpurate=${mpurate} vram=12M')
 
 
 class PandaConfig(OmapConfig):
@@ -914,7 +913,7 @@ 
 def make_boot_script(boot_env, boot_script_path):
     boot_script_data = (
         "setenv bootcmd '%(bootcmd)s'\n"
-        "setenv bootargs '%(bootargs)s'\n"
+        "setenv bootargs %(bootargs)s\n"
         "boot"
         % boot_env)
 

=== 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 09:26:28 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-05-23 14:24:24 +0000
@@ -497,9 +497,7 @@ 
         expected = {
             'bootargs': 'console=tty0 console=ttyO2,115200n8  '
                         'root=UUID=deadbeef rootwait ro earlyprintk '
-                        'mpurate=500 vram=12M '
-                        'omapfb.mode=dvi:1024x768MR-16@60 '
-                        'omapdss.def_disp=dvi',
+                        'mpurate=${mpurate} vram=12M',
             'bootcmd': 'fatload mmc 0:1 0x80000000 uImage; '
                        'fatload mmc 0:1 0x81600000 uInitrd; '
                        'fatload mmc 0:1 0x815f0000 board.dtb; '