[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 361: Set omapfb.vram=0:24M, 1:24M for Android on Panda.

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

Commit Message

Mattias Backman June 23, 2011, 2:05 p.m.
Merge authors:
  Mattias Backman (mabac)
Related merge proposals:
  https://code.launchpad.net/~mabac/linaro-image-tools/bug-800686/+merge/65504
  proposed by: Mattias Backman (mabac)
  review: Approve - Zach Pfeffer (pfefferz)
------------------------------------------------------------
revno: 361 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Thu 2011-06-23 16:01:31 +0200
message:
  Set omapfb.vram=0:24M,1:24M for Android on Panda.
modified:
  linaro_image_tools/media_create/android_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/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2011-04-22 15:09:08 +0000
+++ linaro_image_tools/media_create/android_boards.py	2011-06-23 13:08:29 +0000
@@ -149,6 +149,9 @@ 
 
 class AndroidPandaConfig(AndroidOmapConfig, PandaConfig):
     _extra_serial_opts = 'console=tty0 console=ttyO2,115200n8'
+    extra_boot_args_options = (
+        'earlyprintk fixrtc nocompcache vram=48M '
+        'omapfb.vram=0:24M,1:24M mem=456M@0x80000000 mem=512M@0xA0000000')
     android_specific_args = 'init=/init androidboot.console=ttyO2'
 
 

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-06-14 09:45:13 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-06-23 13:55:09 +0000
@@ -57,6 +57,9 @@ 
     _get_mlo_file,
     _run_mkimage,
     )
+from linaro_image_tools.media_create.android_boards import (
+    android_board_configs,
+    )
 from linaro_image_tools.media_create.chroot_utils import (
     copy_file,
     install_hwpack,
@@ -509,6 +512,26 @@ 
         self.assertEqual(expected, boot_commands)
 
 
+class TestGetBootCmdAndroid(TestCase):
+    def test_panda(self):
+        # XXX: To fix bug 697824 we have to change class attributes of our
+        # OMAP board configs, and some tests do that so to make sure they
+        # don't interfere with us we'll reset that before doing anything.
+        config = android_board_configs['panda']
+        config.serial_tty = config._serial_tty
+        boot_commands = config._get_boot_env(consoles=[])
+        expected = {
+            'bootargs': 'console=tty0 console=ttyO2,115200n8 '
+                        'rootwait ro earlyprintk fixrtc '
+                        'nocompcache vram=48M omapfb.vram=0:24M,1:24M '
+                        'mem=456M@0x80000000 mem=512M@0xA0000000 '
+                        'init=/init androidboot.console=ttyO2',
+            'bootcmd': 'fatload mmc 0:1 0x80200000 uImage; '
+                       'fatload mmc 0:1 0x81600000 uInitrd; '
+                       'bootm 0x80200000 0x81600000'}
+        self.assertEqual(expected, boot_commands)
+
+
 class TestUnpackBinaryTarball(TestCaseWithFixtures):
 
     def setUp(self):