diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 478: Remove console=tty0 on mx53loco bootargs. (LP: #900460)

Message ID 20111219140514.4035.64948.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Mattias Backman Dec. 19, 2011, 2:05 p.m. UTC 
Merge authors:
  Fathi Boudra (fboudra)
  Mattias Backman (mabac)
Related merge proposals:
  https://code.launchpad.net/~fboudra/linaro-image-tools/bug-900460-imx53/+merge/86208
  proposed by: Fathi Boudra (fboudra)
  review: Approve - Mattias Backman (mabac)
------------------------------------------------------------
revno: 478 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Mon 2011-12-19 14:53:00 +0100
message:
  Remove console=tty0 on mx53loco bootargs. (LP: #900460)
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
diff mbox

Patch

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2011-12-15 16:39:01 +0000
+++ linaro_image_tools/media_create/android_boards.py	2011-12-19 09:57:46 +0000
@@ -234,7 +234,7 @@ 
 class AndroidMx53LoCoConfig(AndroidBoardConfig, Mx53LoCoConfig):
     extra_boot_args_options = (
         'earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve')
-    _extra_serial_opts = 'console=tty0 console=%s,115200n8' % (
+    _extra_serial_opts = 'console=%s,115200n8' % (
         Mx53LoCoConfig.serial_tty)
     android_specific_args = 'init=/init androidboot.console=%s' % (
         Mx53LoCoConfig.serial_tty)

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-12-15 16:38:05 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-12-19 13:51:23 +0000
@@ -1178,6 +1178,12 @@ 
             '1843200,-,E\n1843200,1048576,L\n2891776,,,-',
             android_boards.AndroidVexpressA9Config.get_sfdisk_cmd())
 
+    def test_mx5_android(self):
+        self.assertEqual(
+            '1,8191,0xDA\n8192,262144,0x0C,*\n270336,1048576,L\n'
+            '1318912,-,E\n1318912,524288,L\n1843200,1048576,L\n2891776,,,-',
+            android_boards.AndroidMx53LoCoConfig.get_sfdisk_cmd())
+
 class TestGetSfdiskCmdV2(TestCase):
 
     def test_mx5(self):
@@ -1472,6 +1478,19 @@ 
                        'bootm 0x60000000 0x62000000'}
         self.assertEqual(expected, boot_commands)
 
+    def test_android_mx5(self):
+        boot_commands = (android_boards.AndroidMx53LoCoConfig.
+                         _get_boot_env(consoles=[]))
+        expected = {
+            'bootargs': 'console=ttymxc0,115200n8 '
+                        'rootwait ro earlyprintk rootdelay=1 fixrtc '
+                        'nocompcache di1_primary tve init=/init '
+                        'androidboot.console=ttymxc0',
+            'bootcmd': 'fatload mmc 0:2 0x70000000 uImage; '
+                       'fatload mmc 0:2 0x72000000 uInitrd; '
+                       'bootm 0x70000000 0x72000000'}
+        self.assertEqual(expected, boot_commands)
+
 
 class TestUnpackBinaryTarball(TestCaseWithFixtures):