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 a5793d5d2313c5c21f0c2c360f1ad3bf00ea25d1..e543a7d06a7a5957fdbdf4f04bb71e6c07effb81 100755 (executable)
--- 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)