diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 573: Added support for Foundation fastmodel.

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

Commit Message

Milo Casagrande Oct. 9, 2012, 4:12 p.m. UTC 
Merge authors:
  Ricardo Salveti (rsalveti)
Related merge proposals:
  https://code.launchpad.net/~rsalveti/linaro-image-tools/fastmodel-foundation/+merge/128744
  proposed by: Ricardo Salveti (rsalveti)
  review: Approve - Milo Casagrande (milo)
------------------------------------------------------------
revno: 573 [merge]
author: Ricardo Salveti <ricardo.salveti@linaro.org>
committer: Milo Casagrande <milo@ubuntu.com>
branch nick: trunk
timestamp: Tue 2012-10-09 18:11:16 +0200
message:
  Added support for Foundation fastmodel.
modified:
  linaro_image_tools/media_create/boards.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/boards.py'
--- linaro_image_tools/media_create/boards.py	2012-10-02 15:25:27 +0000
+++ linaro_image_tools/media_create/boards.py	2012-10-09 14:39:52 +0000
@@ -1663,9 +1663,13 @@ 
                          d_img_data):
         output_dir = os.path.dirname(boot_device_or_file)
 
-        bootwrapper = _get_file_matching("%s/boot/img.axf" % chroot_dir)
+        # There are 2 kinds of models now, VE and Foundation
+        bw_ve = _get_file_matching("%s/boot/img.axf" % chroot_dir)
+        bw_foundation = _get_file_matching("%s/boot/img-foundation.axf" %
+                                chroot_dir)
 
-        for filename in (bootwrapper, k_img_data, i_img_data, d_img_data):
+        for filename in (bw_ve, bw_foundation, k_img_data,
+                         i_img_data, d_img_data):
             if filename != None:
                 copy_drop(filename, output_dir)