Merge branch 'misc' of git://git.denx.de/u-boot-x86
diff --git a/README b/README
index 0a0f528..276869a 100644
--- a/README
+++ b/README
@@ -272,7 +272,7 @@
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:
diff --git a/board/sandbox/README.sandbox b/board/sandbox/README.sandbox
index 529c447..5f879f5 100644
--- a/board/sandbox/README.sandbox
+++ b/board/sandbox/README.sandbox
@@ -19,7 +19,7 @@
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
machines.
@@ -32,7 +32,7 @@
To run sandbox U-Boot use something like:
- make sandbox_config all
+ make sandbox_defconfig all
./u-boot
Note:
@@ -41,7 +41,7 @@
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
./u-boot
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index e97350f..8b8c826 100644
--- a/tools/buildman/control.py
+++ b/tools/buildman/control.py
@@ -244,13 +244,13 @@
Print(GetActionSummary(options.summary, commits, board_selected,
options))
+ # 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,
options.list_error_boards)
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)
else:
fail, warned = builder.BuildBoards(commits, board_selected,
diff --git a/tools/patman/README b/tools/patman/README
index 5fb508b..e466886 100644
--- a/tools/patman/README
+++ b/tools/patman/README
@@ -27,8 +27,8 @@
in one of your commits, the series will be sent there.
-In Linux this will also call get_maintainer.pl on each of your
-patches automatically.
+In Linux and U-Boot this will also call get_maintainer.pl on each of your
+patches automatically (unless you use -m to disable this).
How to use this tool
diff --git a/tools/patman/patman.py b/tools/patman/patman.py
index 2ab6b35..6c6473e 100755
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@@ -32,6 +32,9 @@
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 @@
ok = True
cc_file = series.MakeCcFile(options.process_tags, cover_fname,
- not options.ignore_bad_tags)
+ not options.ignore_bad_tags,
+ options.add_maintainers)
# Email the patches out (giving the user time to check / cancel)
cmd = ''
diff --git a/tools/patman/series.py b/tools/patman/series.py
index 88c0d87..b67f870 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -201,7 +201,8 @@
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,
+ add_maintainers):
"""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 @@
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
Return:
Filename of temp file created
"""
@@ -225,7 +227,8 @@
raise_on_error=raise_on_error)
list += gitutil.BuildEmailList(commit.cc_list,
raise_on_error=raise_on_error)
- 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