Commit 692c2235 authored by Tom Rini's avatar Tom Rini
Browse files

Merge branch 'misc' of git://

parents 2a8c9c86 983a2749
......@@ -272,7 +272,7 @@ board. This allows feature development which is not board- or architecture-
specific to be undertaken on a native platform. The sandbox is also used to
run some of U-Boot's tests.
See board/sandbox/sandbox/README.sandbox for more details.
See board/sandbox/README.sandbox for more details.
Configuration Options:
......@@ -19,7 +19,7 @@ create unit tests which we can run to test this upper level code.
CONFIG_SANDBOX is defined when building a native board.
The chosen vendor and board names are also 'sandbox', so there is a single
board in board/sandbox/sandbox.
board in board/sandbox.
CONFIG_SANDBOX_BIG_ENDIAN should be defined when running on big-endian
......@@ -32,7 +32,7 @@ Basic Operation
To run sandbox U-Boot use something like:
make sandbox_config all
make sandbox_defconfig all
......@@ -41,7 +41,7 @@ Note:
build sandbox without SDL (i.e. no display/keyboard support) by removing
the CONFIG_SANDBOX_SDL line in include/configs/sandbox.h or using:
make sandbox_config all NO_SDL=1
make sandbox_defconfig all NO_SDL=1
......@@ -244,13 +244,13 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
Print(GetActionSummary(options.summary, commits, board_selected,
# We can't show function sizes without board details at present
if options.show_bloat:
options.show_detail = True
builder.SetDisplayOptions(options.show_errors, options.show_sizes,
options.show_detail, options.show_bloat,
if options.summary:
# We can't show function sizes without board details at present
if options.show_bloat:
options.show_detail = True
builder.ShowSummary(commits, board_selected)
fail, warned = builder.BuildBoards(commits, board_selected,
......@@ -27,8 +27,8 @@ Series-to:
in one of your commits, the series will be sent there.
In Linux this will also call on each of your
patches automatically.
In Linux and U-Boot this will also call on each of your
patches automatically (unless you use -m to disable this).
How to use this tool
......@@ -32,6 +32,9 @@ parser.add_option('-c', '--count', dest='count', type='int',
parser.add_option('-i', '--ignore-errors', action='store_true',
dest='ignore_errors', default=False,
help='Send patches email even if patch errors are found')
parser.add_option('-m', '--no-maintainers', action='store_false',
dest='add_maintainers', default=True,
help="Don't cc the file maintainers automatically")
parser.add_option('-n', '--dry-run', action='store_true', dest='dry_run',
default=False, help="Do a dry run (create but don't email patches)")
parser.add_option('-p', '--project', default=project.DetectProject(),
......@@ -142,7 +145,8 @@ else:
ok = True
cc_file = series.MakeCcFile(options.process_tags, cover_fname,
not options.ignore_bad_tags)
not options.ignore_bad_tags,
# Email the patches out (giving the user time to check / cancel)
cmd = ''
......@@ -201,7 +201,8 @@ class Series(dict):
str = 'Change log exists, but no version is set'
print col.Color(col.RED, str)
def MakeCcFile(self, process_tags, cover_fname, raise_on_error):
def MakeCcFile(self, process_tags, cover_fname, raise_on_error,
"""Make a cc file for us to use for per-commit Cc automation
Also stores in self._generated_cc to make ShowActions() faster.
......@@ -211,6 +212,7 @@ class Series(dict):
cover_fname: If non-None the name of the cover letter.
raise_on_error: True to raise an error when an alias fails to match,
False to just print a message.
add_maintainers: Call the get_maintainers to CC maintainers
Filename of temp file created
......@@ -225,7 +227,8 @@ class Series(dict):
list += gitutil.BuildEmailList(commit.cc_list,
list += get_maintainer.GetMaintainer(commit.patch)
if add_maintainers:
list += get_maintainer.GetMaintainer(commit.patch)
all_ccs += list
print >>fd, commit.patch, ', '.join(list)
self._generated_cc[commit.patch] = list
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment