From b5287c41266fcbd5d31271e1faef3159debf02e1 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 9 Jul 2020 18:39:30 -0600
Subject: [PATCH] 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>
---
tools/binman/main.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/binman/main.py b/tools/binman/main.py
index a5793d5d23..e543a7d06a 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)
--
2.39.5