diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 415: Look for u-boot.img before u-boot.bin which is needed when u-boot SPL is enabled for Pandaboard.

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

Commit Message

Mattias Backman Aug. 19, 2011, 2:09 p.m. UTC 
Merge authors:
  Mattias Backman (mabac)
------------------------------------------------------------
revno: 415 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: trunk
timestamp: Fri 2011-08-19 16:03:12 +0200
message:
  Look for u-boot.img before u-boot.bin which is needed when u-boot SPL is enabled for Pandaboard.
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-10 22:42:02 +0000
+++ linaro_image_tools/media_create/boards.py	2011-08-19 13:59:34 +0000
@@ -473,7 +473,11 @@ 
                 with cls.hardwarepack_handler:
                     default = os.path.join(
                         chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor,
-                        'u-boot.bin')
+                        'u-boot.img')
+                    if not os.path.exists(default):
+                        default = os.path.join(
+                            chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor,
+                            'u-boot.bin')
                     uboot_bin = cls.get_file('u_boot', default=default)
                     proc = cmd_runner.run(
                         ['cp', '-v', uboot_bin, boot_disk], as_root=True)