leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildman: adjust for Kconfig

Browse Source 
Use "make <board>_defconfig" instead of "make <board>_config".

Invoke tools/genboardscfg.py to generate boards.cfg when it is missing.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada 2014-07-30 14:08:22 +09:00 committed by Tom Rini
parent bb6da87d7e
commit 73f30b9b80
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/buildman/board.py
View File

@ -17,7 +17,7 @@ class Board:
soc: Name of SOC, or '' if none (e.g. mx31) soc: Name of SOC, or '' if none (e.g. mx31)
vendor: Name of vendor (e.g. armltd) vendor: Name of vendor (e.g. armltd)
board_name: Name of board (e.g. integrator) board_name: Name of board (e.g. integrator)
target: Target name (use make <target>_config to configure) target: Target name (use make <target>_defconfig to configure)
options: board-specific options (e.g. integratorcp:CM1136) options: board-specific options (e.g. integratorcp:CM1136)
""" """
self.target = target self.target = target

6
tools/buildman/builder.py
View File

@ -199,7 +199,7 @@ class BuilderThread(threading.Thread):
commit_upto: Commit number to build (0...n-1) commit_upto: Commit number to build (0...n-1)
brd: Board object to build brd: Board object to build
work_dir: Directory to which the source will be checked out work_dir: Directory to which the source will be checked out
do_config: True to run a make <board>_config on the source do_config: True to run a make <board>_defconfig on the source
force_build: Force a build even if one was previously done force_build: Force a build even if one was previously done
force_build_failures: Force a bulid if the previous result showed force_build_failures: Force a bulid if the previous result showed
failure failure
@ -266,7 +266,7 @@ class BuilderThread(threading.Thread):
args.append('-s') args.append('-s')
if self.builder.num_jobs is not None: if self.builder.num_jobs is not None:
args.extend(['-j', str(self.builder.num_jobs)]) args.extend(['-j', str(self.builder.num_jobs)])
config_args = ['%s_config' % brd.target] config_args = ['%s_defconfig' % brd.target]
config_out = '' config_out = ''
args.extend(self.builder.toolchains.GetMakeArguments(brd)) args.extend(self.builder.toolchains.GetMakeArguments(brd))
@ -419,7 +419,7 @@ class BuilderThread(threading.Thread):
work_dir = self.builder.GetThreadDir(self.thread_num) work_dir = self.builder.GetThreadDir(self.thread_num)
self.toolchain = None self.toolchain = None
if job.commits: if job.commits:
# Run 'make board_config' on the first commit # Run 'make board_defconfig' on the first commit
do_config = True do_config = True
commit_upto = 0 commit_upto = 0
force_build = False force_build = False

10
tools/buildman/control.py
View File

@ -15,6 +15,7 @@ import patchstream
import terminal import terminal
import toolchain import toolchain
import command import command
import subprocess
def GetPlural(count): def GetPlural(count):
"""Returns a plural 's' if count is not 1""" """Returns a plural 's' if count is not 1"""
@ -109,6 +110,15 @@ def DoBuildman(options, args):
sys.exit(1) sys.exit(1)
# Work out what subset of the boards we are building # Work out what subset of the boards we are building
board_file = os.path.join(options.git, 'boards.cfg')
if not os.path.exists(board_file):
print 'Could not find %s' % board_file
status = subprocess.call([os.path.join(options.git,
'tools/genboardscfg.py')])
if status != 0:
print >> sys.stderr, "Failed to generate boards.cfg"
sys.exit(1)
boards = board.Boards() boards = board.Boards()
boards.ReadBoards(os.path.join(options.git, 'boards.cfg')) boards.ReadBoards(os.path.join(options.git, 'boards.cfg'))
why_selected = boards.SelectBoards(args) why_selected = boards.SelectBoards(args)