Merge lp:~danilo/linaro-image-tools/bug-900460-panda into lp:linaro-image-tools/11.11

[Данило Шеган]

= Bug 900460 =

'console=tty0' presence causes ugliness for PandaBoard android builds. Since we are close to a release and we haven't received any other reports, we are not changing any other board's config.

[Guilherme Salgado (salgado)]

Looks good to me.

 review approve

review: Approve

=== 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:51:25 +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:51:25 +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 '