summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-09-05 19:00:14 -0600
committerSimon Glass <sjg@chromium.org>2014-09-09 16:38:28 -0600
commitfd03d63f347e28e4e4394245210f048c82c9b085 (patch)
tree4af8efba0ca9a5ae1ea28b9a7a0d340c0a0e0631 /tools
parentd4144e45b4245c60f50d456293cad2f53373efcd (diff)
buildman: Set up bsettings outside the control module
Move the bsettings code back to the main buildman.py file, so we can do something different when testing. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/buildman/buildman.py2
-rw-r--r--tools/buildman/control.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/buildman/buildman.py b/tools/buildman/buildman.py
index 6771c862d34..d0afeda6c07 100755
--- a/tools/buildman/buildman.py
+++ b/tools/buildman/buildman.py
@@ -19,6 +19,7 @@ sys.path.append(os.path.join(our_path, '../patman'))
# Our modules
import board
+import bsettings
import builder
import checkpatch
import cmdline
@@ -59,5 +60,6 @@ if options.test:
# Build selected commits for selected boards
else:
+ bsettings.Setup(options.config_file)
ret_code = control.DoBuildman(options, args)
sys.exit(ret_code)
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 213e235a113..c8eeb6ac45c 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -101,7 +101,6 @@ def DoBuildman(options, args, toolchains=None, make_func=None):
gitutil.Setup()
- bsettings.Setup(options.config_file)
options.git_dir = os.path.join(options.git, '.git')
if not toolchains: