commit c7d8035ec185c789f8182c7d3374db4dcdbd250b
author Simon Glass <sjg@chromium.org> Mon Jul 08 13:18:28 2019 -0600
committer Simon Glass <sjg@chromium.org> Tue Jul 23 20:27:57 2019 -0700
tree 80e381e107190f74581533a8519c579f67f047b1
parent c22b8cfc1dc6a8fd9e45dd56b2945ccf979aa2c8

binman: Add a --toolpath option to set the tool search path

Sometimes tools used by binman may not be in the normal PATH search path,
such as when the tool is built by the U-Boot build itself (e.g. mkimage).
Provide a way to specify an additional search path for tools. The flag
can be used multiple times.

Update the help to describe this option.

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

tools/binman/README

diff --git a/tools/binman/README b/tools/binman/README
index decca47..28624fa 100644
--- a/tools/binman/README
+++ b/tools/binman/README
@@ -691,6 +691,16 @@
 typically for filenames.
 
 
+External tools
+--------------
+
+Binman can make use of external command-line tools to handle processing of
+entry contents or to generate entry contents. These tools are executed using
+the 'tools' module's Run() method. The tools generally must exist on the PATH,
+but the --toolpath option can be used to specify additional search paths to
+use. This option can be specified multiple times to add more than one path.
+
+
 Code coverage
 -------------
 

tools/binman/cmdline.py

diff --git a/tools/binman/cmdline.py b/tools/binman/cmdline.py
index 3886d52..ee19c5e 100644
--- a/tools/binman/cmdline.py
+++ b/tools/binman/cmdline.py
@@ -52,6 +52,8 @@
                     default=False, help='run tests')
     parser.add_option('-T', '--test-coverage', action='store_true',
                     default=False, help='run tests and check for 100% coverage')
+    parser.add_option('--toolpath', type='string', action='append',
+            help='Add a path to the directories containing tools')
     parser.add_option('-u', '--update-fdt', action='store_true',
         default=False, help='Update the binman node with offset/size info')
     parser.add_option('-v', '--verbosity', default=1,

tools/binman/control.py

diff --git a/tools/binman/control.py b/tools/binman/control.py
index 20186ee..df78848 100644
--- a/tools/binman/control.py
+++ b/tools/binman/control.py
@@ -112,6 +112,7 @@
         try:
             tools.SetInputDirs(options.indir)
             tools.PrepareOutputDir(options.outdir, options.preserve)
+            tools.SetToolPaths(options.toolpath)
             state.SetEntryArgs(options.entry_arg)
 
             # Get the device tree ready by compiling it and copying the compiled