Merge lp:~fboudra/linaro-image-tools/bug-900460-imx53 into lp:linaro-image-tools/11.11

Proposed by Fathi Boudra
Status: Merged
Merged at revision: 478
Proposed branch: lp:~fboudra/linaro-image-tools/bug-900460-imx53
Merge into: lp:linaro-image-tools/11.11
Diff against target: 12 lines (+1/-1)
1 file modified
linaro_image_tools/media_create/android_boards.py (+1/-1)
To merge this branch: bzr merge lp:~fboudra/linaro-image-tools/bug-900460-imx53
Reviewer Review Type Date Requested Status
Mattias Backman (community) Approve
Review via email: mp+86208@code.launchpad.net

Description of the change

Remove console=tty0 on mx53loco bootargs. (LP: #900460)

To post a comment you must log in.
Revision history for this message
Mattias Backman (mabac) wrote :

That will break a test, I hope. If it doesn't we need to add one. I'll take a look in a bit.

review: Needs Fixing
Revision history for this message
Mattias Backman (mabac) wrote :

The two missing tests have been added.

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-15 16:39:01 +0000
3+++ linaro_image_tools/media_create/android_boards.py 2011-12-19 10:19:25 +0000
4@@ -234,7 +234,7 @@
5 class AndroidMx53LoCoConfig(AndroidBoardConfig, Mx53LoCoConfig):
6 extra_boot_args_options = (
7 'earlyprintk rootdelay=1 fixrtc nocompcache di1_primary tve')
8- _extra_serial_opts = 'console=tty0 console=%s,115200n8' % (
9+ _extra_serial_opts = 'console=%s,115200n8' % (
10 Mx53LoCoConfig.serial_tty)
11 android_specific_args = 'init=/init androidboot.console=%s' % (
12 Mx53LoCoConfig.serial_tty)

Subscribers

People subscribed via source and target branches