Linaro Image Tools

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

  1. bug-900460-panda
  2. Merge into trunk
Proposed by Данило Шеган
Status: Merged
Approved by: Данило Шеган
Approved revision: 475
Merged at revision: 474
Proposed branch: lp:~danilo/linaro-image-tools/bug-900460-panda
Merge into: lp:linaro-image-tools/11.11
Diff against target: 25 lines (+2/-2)
2 files modified
linaro_image_tools/media_create/android_boards.py (+1/-1)
linaro_image_tools/media_create/tests/test_media_create.py (+1/-1)
To merge this branch: bzr merge lp:~danilo/linaro-image-tools/bug-900460-panda
Reviewer Review Type Date Requested Status
Guilherme Salgado (community) Approve
Review via email: mp+85908@code.launchpad.net

Description of the change

= 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.

To post a comment you must log in.
Revision history for this message
Guilherme Salgado (salgado) wrote :

Looks good to me.

 review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro_image_tools/media_create/android_boards.py'
2--- linaro_image_tools/media_create/android_boards.py 2011-12-05 19:53:49 +0000
3+++ linaro_image_tools/media_create/android_boards.py 2011-12-15 16:51:25 +0000
4@@ -179,7 +179,7 @@
5
6
7 class AndroidPandaConfig(AndroidOmapConfig, PandaConfig):
8- _extra_serial_opts = 'console=tty0 console=ttyO2,115200n8'
9+ _extra_serial_opts = 'console=ttyO2,115200n8'
10 extra_boot_args_options = (
11 'earlyprintk fixrtc nocompcache vram=48M '
12 'omapfb.vram=0:24M,1:24M mem=456M@0x80000000 mem=512M@0xA0000000')
13
14=== modified file 'linaro_image_tools/media_create/tests/test_media_create.py'
15--- linaro_image_tools/media_create/tests/test_media_create.py 2011-12-05 19:53:49 +0000
16+++ linaro_image_tools/media_create/tests/test_media_create.py 2011-12-15 16:51:25 +0000
17@@ -1412,7 +1412,7 @@
18 config.serial_tty = config._serial_tty
19 boot_commands = config._get_boot_env(consoles=[])
20 expected = {
21- 'bootargs': 'console=tty0 console=ttyO2,115200n8 '
22+ 'bootargs': 'console=ttyO2,115200n8 '
23 'rootwait ro earlyprintk fixrtc '
24 'nocompcache vram=48M omapfb.vram=0:24M,1:24M '
25 'mem=456M@0x80000000 mem=512M@0xA0000000 '

Subscribers

People subscribed via source and target branches