diff mbox

[flasher,3/3] Support U-Boot's temporary output DTB path

Message ID 1393352927-27595-3-git-send-email-swarren@wwwdotorg.org
State Accepted, archived
Headers show

Commit Message

Stephen Warren Feb. 25, 2014, 6:28 p.m. UTC 
From: Stephen Warren <swarren@nvidia.com>

Historically, U-Boot has generated $(obj)/u-boot.dtb. During the Kbuild
conversion, this file was moved to $(obj)/dts/dt.dtb. While this change
will be imminentely reverted in the U-Boot makefiles, it's quite easy to
support in the flasher build scripts, so we may as well. This prevents
user confusion and/or "git bisect" issues.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 build | 2 ++
 1 file changed, 2 insertions(+)
diff mbox

Patch

diff --git a/build b/build
index f1df6ce9536b..7bfc2d9d0aa8 100755
--- a/build
+++ b/build
@@ -136,6 +136,8 @@  def import_uboot_one_board(boardname, build_uboot_dir):
     cp(src, dst)
 
     src = os.path.join(build_uboot_dir, 'u-boot.dtb')
+    if not os.path.exists(src):
+        src = os.path.join(build_uboot_dir, 'dts/dt.dtb')
     dst = os.path.join(out_board_dir, 'u-boot.dtb')
     cp(src, dst)