mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-30 19:11:37 +00:00
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>
This commit is contained in:
parent
d4144e45b4
commit
fd03d63f34
2 changed files with 2 additions and 1 deletions
|
@ -19,6 +19,7 @@ sys.path.append(os.path.join(our_path, '../patman'))
|
||||||
|
|
||||||
# Our modules
|
# Our modules
|
||||||
import board
|
import board
|
||||||
|
import bsettings
|
||||||
import builder
|
import builder
|
||||||
import checkpatch
|
import checkpatch
|
||||||
import cmdline
|
import cmdline
|
||||||
|
@ -59,5 +60,6 @@ if options.test:
|
||||||
|
|
||||||
# Build selected commits for selected boards
|
# Build selected commits for selected boards
|
||||||
else:
|
else:
|
||||||
|
bsettings.Setup(options.config_file)
|
||||||
ret_code = control.DoBuildman(options, args)
|
ret_code = control.DoBuildman(options, args)
|
||||||
sys.exit(ret_code)
|
sys.exit(ret_code)
|
||||||
|
|
|
@ -101,7 +101,6 @@ def DoBuildman(options, args, toolchains=None, make_func=None):
|
||||||
|
|
||||||
gitutil.Setup()
|
gitutil.Setup()
|
||||||
|
|
||||||
bsettings.Setup(options.config_file)
|
|
||||||
options.git_dir = os.path.join(options.git, '.git')
|
options.git_dir = os.path.join(options.git, '.git')
|
||||||
|
|
||||||
if not toolchains:
|
if not toolchains:
|
||||||
|
|
Loading…
Add table
Reference in a new issue