diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 430: Look for Origen spl file origen-spl.bin since upstream changed the expected name.

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

Commit Message

Mattias Backman Aug. 31, 2011, 1:38 p.m. UTC 
Merge authors:
  Angus Ainslie (angus-akkea)
Related merge proposals:
  https://code.launchpad.net/~linaro-landing-team-samsung/linaro-image-tools/new-origen-spl/+merge/73479
  proposed by: Angus Ainslie (angus-akkea)
  review: Approve - Mattias Backman (mabac)
------------------------------------------------------------
revno: 430 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: trunk
timestamp: Wed 2011-08-31 15:35:02 +0200
message:
  Look for Origen spl file origen-spl.bin since upstream changed the expected name.
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	2011-08-30 08:52:00 +0000
+++ linaro_image_tools/media_create/boards.py	2011-08-31 13:35:02 +0000
@@ -1182,12 +1182,17 @@ 
             chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor)
         old_spl_path = os.path.join(spl_dir, 'v310_mmc_spl.bin')
         new_spl_path = os.path.join(spl_dir, 'u-boot-mmc-spl.bin')
+        new_new_spl_path = os.path.join(spl_dir, 'origen-spl.bin')
 
         spl_file = old_spl_path
         # The new upstream u-boot filename has changed
         if not os.path.exists(spl_file):
             spl_file = new_spl_path
 
+        # The new upstream u-boot filename has changed again
+        if not os.path.exists(spl_file):
+            spl_file = new_new_spl_path
+
         if not os.path.exists(spl_file):
             # missing SPL loader
             raise AssertionError("Couldn't find the SPL file, tried %s and %s"