Linaro Image Tools

Merge lp:~riku-voipio/linaro-image-tools/fix-fastmodel-builds into lp:linaro-image-tools/11.11

  1. fix-fastmodel-builds
  2. Merge into trunk
Proposed by Riku Voipio
Status: Merged
Approved by: Fathi Boudra
Approved revision: 556
Merged at revision: 556
Proposed branch: lp:~riku-voipio/linaro-image-tools/fix-fastmodel-builds
Merge into: lp:linaro-image-tools/11.11
Diff against target: 12 lines (+1/-1)
1 file modified
linaro_image_tools/media_create/boards.py (+1/-1)
To merge this branch: bzr merge lp:~riku-voipio/linaro-image-tools/fix-fastmodel-builds
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
linaro-image-tools maintainers Pending
Review via email: mp+122479@code.launchpad.net

Description of the change

Change the arguments of function _get_bootcmd() for fastmodels to match the overriden function.

To post a comment you must log in.
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

+1

Revision history for this message
Ricardo Salveti (rsalveti) :
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/boards.py'
2--- linaro_image_tools/media_create/boards.py 2012-08-27 00:51:26 +0000
3+++ linaro_image_tools/media_create/boards.py 2012-09-03 09:27:30 +0000
4@@ -1385,7 +1385,7 @@
5 supports_writing_to_mmc = False
6
7 @classmethod
8- def _get_bootcmd(cls, d_img_data):
9+ def _get_bootcmd(cls, i_img_data, d_img_data):
10 """Get the bootcmd for FastModel.
11
12 We override this as we don't do uboot.

Subscribers

People subscribed via source and target branches