Merge branch 'uboot'

10 files changed, 35 insertions, 148 deletions

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 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
         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/buildman/kconfiglib.py b/tools/buildman/kconfiglib.py
index 31fd3c9..655cf44 100644
--- a/tools/buildman/kconfiglib.py
+++ b/tools/buildman/kconfiglib.py
@@ -1,5 +1,5 @@
 #
-# SPDX-License-Identifier:	GPL-2.0+
+# SPDX-License-Identifier:	ISC
 #
 # Author: Ulf Magnusson
 #   https://github.com/ulfalizer/Kconfiglib
diff --git a/tools/env/Makefile b/tools/env/Makefile
index 4927489..40164f7 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -21,14 +21,16 @@ HOST_EXTRACFLAGS += -DMTD_OLD
 endif
 
 always := fw_printenv
-hostprogs-y := fw_printenv_unstripped
+hostprogs-y := fw_printenv
 
-fw_printenv_unstripped-objs := fw_env.o fw_env_main.o \
+fw_printenv-objs := fw_env.o fw_env_main.o \
 	crc32.o ctype.o linux_string.o \
 	env_attr.o env_flags.o aes.o
 
-quiet_cmd_strip = STRIP   $@
-      cmd_strip = $(STRIP) -o $@ $<
+quiet_cmd_crosstools_strip = STRIP   $^
+      cmd_crosstools_strip = $(STRIP) $^; touch $@
 
-$(obj)/fw_printenv: $(obj)/fw_printenv_unstripped FORCE
-	$(call if_changed,strip)
+$(obj)/.strip: $(obj)/fw_printenv
+	$(call cmd,crosstools_strip)
+
+always += .strip
diff --git a/tools/genboardscfg.py b/tools/genboardscfg.py
index 654100b..23c956b 100755
--- a/tools/genboardscfg.py
+++ b/tools/genboardscfg.py
@@ -328,6 +328,9 @@ class MaintainersDatabase:
         maintainers = []
         status = '-'
         for line in open(file):
+            # Check also commented maintainers
+            if line[:3] == '#M:':
+                line = line[1:]
             tag, rest = line[:2], line[2:].strip()
             if tag == 'M:':
                 maintainers.append(rest)
diff --git a/tools/imximage.c b/tools/imximage.c
index 18dc051..faba238 100644
--- a/tools/imximage.c
+++ b/tools/imximage.c
@@ -568,6 +568,13 @@ static void imximage_set_header(void *ptr, struct stat *sbuf, int ifd,
 	/* Parse dcd configuration file */
 	dcd_len = parse_cfg_file(imxhdr, params->imagename);
 
+	if (imximage_version == IMXIMAGE_V2) {
+		if (imximage_init_loadsize < imximage_ivt_offset +
+			sizeof(imx_header_v2_t))
+				imximage_init_loadsize = imximage_ivt_offset +
+					sizeof(imx_header_v2_t);
+	}
+
 	/* Set the imx header */
 	(*set_imx_hdr)(imxhdr, dcd_len, params->ep, imximage_ivt_offset);
 
diff --git a/tools/imximage.h b/tools/imximage.h
index 01f861e..5b5ad0e 100644
--- a/tools/imximage.h
+++ b/tools/imximage.h
@@ -8,7 +8,7 @@
 #ifndef _IMXIMAGE_H_
 #define _IMXIMAGE_H_
 
-#define MAX_HW_CFG_SIZE_V2 121 /* Max number of registers imx can set for v2 */
+#define MAX_HW_CFG_SIZE_V2 220 /* Max number of registers imx can set for v2 */
 #define MAX_HW_CFG_SIZE_V1 60  /* Max number of registers imx can set for v1 */
 #define APP_CODE_BARKER	0xB1
 #define DCD_BARKER	0xB17219E9
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 @@ Series-to: fred.blogs@napier.co.nz
 
 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('-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,
+                                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 @@ 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,
+                   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 @@ 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
         Return:
             Filename of temp file created
         """
@@ -225,7 +227,8 @@ class Series(dict):
                                                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
diff --git a/tools/reformat.py b/tools/reformat.py
deleted file mode 100755
index 61306d0..0000000
--- a/tools/reformat.py
+++ /dev/null
@@ -1,132 +0,0 @@
-#! /usr/bin/python
-########################################################################
-#
-# reorder and reformat a file in columns
-#
-# this utility takes lines from its standard input and reproduces them,
-# partially reordered and reformatted, on its standard output.
-#
-# It has the same effect as a 'sort | column -t', with the exception
-# that empty lines, as well as lines which start with a '#' sign, are
-# not affected, i.e. they keep their position and formatting, and act
-# as separators, i.e. the parts before and after them are each sorted
-# separately (but overall field widths are computed across the whole
-# input).
-#
-# Options:
-#   -i:
-#   --ignore-case:
-#	Do not consider case when sorting.
-#   -d:
-#   --default:
-#	What to chage empty fields to.
-#    -s <N>:
-#    --split=<N>:
-#       Treat only the first N whitespace sequences as separators.
-#       line content after the Nth separator will count as only one
-#       field even if it contains whitespace.
-#       Example : '-s 2' causes input 'a b c d e' to be split into
-#       three fields, 'a', 'b', and 'c d e'.
-#
-# boards.cfg requires -ids 6.
-#
-########################################################################
-
-import sys, getopt, locale
-
-# ensure we sort using the C locale.
-
-locale.setlocale(locale.LC_ALL, 'C')
-
-# check options
-
-maxsplit = 0
-ignore_case = 0
-default_field =''
-
-try:
-	opts, args = getopt.getopt(sys.argv[1:], "id:s:",
-		["ignore-case","default","split="])
-except getopt.GetoptError as err:
-	print str(err) # will print something like "option -a not recognized"
-	sys.exit(2)
-
-for o, a in opts:
-	if o in ("-s", "--split"):
-		maxsplit = eval(a)
-	elif o in ("-i", "--ignore-case"):
-		ignore_case = 1
-	elif o in ("-d", "--default"):
-		default_field = a
-	else:
-		assert False, "unhandled option"
-
-# collect all lines from standard input and, for the ones which must be
-# reformatted and sorted, count their fields and compute each field's
-# maximum size
-
-input_lines = []
-field_width = []
-
-for line in sys.stdin:
-	# remove final end of line
-	input_line = line.strip('\n')
-	if (len(input_line)>0) and (input_line[0] != '#'):
-		# sortable line: split into fields
-		fields = input_line.split(None,maxsplit)
-		# if there are new fields, top up field_widths
-		for f in range(len(field_width), len(fields)):
-			field_width.append(0)
-		# compute the maximum witdh of each field
-		for f in range(len(fields)):
-			field_width[f] = max(field_width[f],len(fields[f]))
-	# collect the line for next stage
-	input_lines.append(input_line)
-
-# run through collected input lines, collect the ones which must be
-# reformatted and sorted, and whenever a non-reformattable, non-sortable
-# line is met, sort the collected lines before it and append them to the
-# output lines, then add the non-sortable line too.
-
-output_lines = []
-sortable_lines = []
-for input_line in input_lines:
-	if (len(input_line)>0) and (input_line[0] != '#'):
-		# this line should be reformatted and sorted
-		input_fields = input_line.split(None,maxsplit)
-		output_fields = [];
-		# reformat each field to this field's column width
-		for f in range(len(input_fields)):
-			output_field = input_fields[f];
-			output_fields.append(output_field.ljust(field_width[f]))
-		# any missing field is set to default if it exists
-		if default_field != '':
-			for f in range(len(input_fields),len(field_width)):
-				output_fields.append(default_field.ljust(field_width[f]))
-		# join fields using two spaces, like column -t would
-		output_line = '  '.join(output_fields);
-		# collect line for later
-		sortable_lines.append(output_line)
-	else:
-		# this line is non-sortable
-		# sort collected sortable lines
-		if ignore_case!=0:
-			sortable_lines.sort(key=lambda x: str.lower(locale.strxfrm(x)))
-		else:
-			sortable_lines.sort(key=lambda x: locale.strxfrm(x))
-		# append sortable lines to the final output
-		output_lines.extend(sortable_lines)
-		sortable_lines = []
-		# append non-sortable line to the final output
-		output_lines.append(input_line)
-# maybe we had sortable lines pending, so append them to the final output
-if ignore_case!=0:
-	sortable_lines.sort(key=lambda x: str.lower(locale.strxfrm(x)))
-else:
-	sortable_lines.sort(key=lambda x: locale.strxfrm(x))
-output_lines.extend(sortable_lines)
-
-# run through output lines and print them, except rightmost whitespace
-
-for output_line in output_lines:
-	print output_line.rstrip()