[v3,07/49] binman: Set a default toolpath

Message ID 20200709183948.v3.7.Ia130d5b79b8e1ffb3caac27ef303a88c8d5d1723@changeid
State Accepted
Commit ce774e94de7009be0039ee02ca75f93d33a285a9
Headers show
Series
  • rockchip: x86: Support building ROM files automatically with binman
Related show

Commit Message

Simon Glass July 10, 2020, 12:39 a.m.
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 at chromium.org>
---

Changes in v3:
- Set a default toolpath for ease of use

 tools/binman/main.py | 5 +++++
 1 file changed, 5 insertions(+)

Patch

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)