diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 474: [r=salgado] Do not pass console=tty0 in the bootargs for PandaBoard AndroidConfig. Fixes #900460.

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

Commit Message

Данило Шеган Dec. 15, 2011, 5:47 p.m. UTC 
Merge authors:
  Данило Шеган (danilo)
Related merge proposals:
  https://code.launchpad.net/~danilo/linaro-image-tools/bug-900460-panda/+merge/85908
  proposed by: Данило Шеган (danilo)
  review: Approve - Guilherme Salgado (salgado)
------------------------------------------------------------
revno: 474 [merge]
committer: Danilo Segan <danilo@canonical.com>
branch nick: trunk
timestamp: Thu 2011-12-15 18:45:39 +0100
message:
  [r=salgado] Do not pass console=tty0 in the bootargs for PandaBoard AndroidConfig. Fixes #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-05 19:53:49 +0000
+++ linaro_image_tools/media_create/android_boards.py	2011-12-15 16:39:01 +0000
@@ -179,7 +179,7 @@ 
 
 
 class AndroidPandaConfig(AndroidOmapConfig, PandaConfig):
-    _extra_serial_opts = 'console=tty0 console=ttyO2,115200n8'
+    _extra_serial_opts = 'console=ttyO2,115200n8'
     extra_boot_args_options = (
         'earlyprintk fixrtc nocompcache vram=48M '
         'omapfb.vram=0:24M,1:24M mem=456M@0x80000000 mem=512M@0xA0000000')

=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
--- linaro_image_tools/media_create/tests/test_media_create.py	2011-12-05 19:53:49 +0000
+++ linaro_image_tools/media_create/tests/test_media_create.py	2011-12-15 16:38:05 +0000
@@ -1412,7 +1412,7 @@ 
         config.serial_tty = config._serial_tty
         boot_commands = config._get_boot_env(consoles=[])
         expected = {
-            'bootargs': 'console=tty0 console=ttyO2,115200n8 '
+            'bootargs': 'console=ttyO2,115200n8 '
                         'rootwait ro earlyprintk fixrtc '
                         'nocompcache vram=48M omapfb.vram=0:24M,1:24M '
                         'mem=456M@0x80000000 mem=512M@0xA0000000 '