summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-07-09 18:39:30 -0600
committerSimon Glass <sjg@chromium.org>2020-07-24 19:25:15 -0600
commitb5287c41266fcbd5d31271e1faef3159debf02e1 (patch)
treeb807566d04902f704fdb5f9aa8294f3cec0a69ab /tools
parent32eb66d2d4f3f761d98946414bcf7ca08600d422 (diff)
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>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/binman/main.py5
1 files changed, 5 insertions, 0 deletions
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)