From: Simon Glass <sjg@chromium.org>
Date: Fri, 10 Jul 2020 00:39:30 +0000 (-0600)
Subject: binman: Set a default toolpath
X-Git-Tag: v2020.10~98^2~41
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5287c41266fcbd5d31271e1faef3159debf02e1;p=platform%2Fkernel%2Fu-boot.git

binman: Set a default toolpath

When binman is run from 'make check' it is given a toolpath so that the
latest tools (e.g. mkimage) are used. When run manually with no toolpath,
it relies on the system mkimage. But this may be missing or old.

Make some effort to find the built-from-soruce version by looking in the
current directory and in the builds created by 'make check'.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/binman/main.py b/tools/binman/main.py
index a5793d5..e543a7d 100755
--- a/tools/binman/main.py
+++ b/tools/binman/main.py
@@ -113,6 +113,11 @@ def RunBinman(args):
     if not args.debug:
         sys.tracebacklimit = 0
 
+    # Provide a default toolpath in the hope of finding a mkimage built from
+    # current source
+    if not args.toolpath:
+        args.toolpath = ['./tools', 'build-sandbox/tools']
+
     if args.cmd == 'test':
         if args.test_coverage:
             RunTestCoverage(args.toolpath)