Merge branch 'patman' of git://git.denx.de/u-boot-x86

Tom Rini
2 parents 6a608f20b9 3d4de98696
Showing 7 changed files Side-by-side Diff
arch/sandbox/cpu/start.c
arch/sandbox/dts/sandbox.dts
board/sandbox/README.sandbox
tools/patman/README
tools/patman/gitutil.py
tools/patman/patchstream.py
tools/patman/series.py
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <os.h>
 #include <cli.h>
+#include <malloc.h>
 #include <asm/getopt.h>
 #include <asm/io.h>
 #include <asm/sections.h>
@@ -101,6 +102,25 @@
 	return 0;
 }
 SANDBOX_CMDLINE_OPT_SHORT(fdt, 'd', 1, "Specify U-Boot's control FDT");
+
+static int sandbox_cmdline_cb_default_fdt(struct sandbox_state *state,
+					  const char *arg)
+{
+	const char *fmt = "%s.dtb";
+	char *fname;
+	int len;
+
+	len = strlen(state->argv[0]) + strlen(fmt) + 1;
+	fname = os_malloc(len);
+	if (!fname)
+		return -ENOMEM;
+	snprintf(fname, len, fmt, state->argv[0]);
+	state->fdt_fname = fname;
+
+	return 0;
+}
+SANDBOX_CMDLINE_OPT_SHORT(default_fdt, 'D', 0,
+		"Use the default u-boot.dtb control FDT in U-Boot directory");
  
 static int sandbox_cmdline_cb_interactive(struct sandbox_state *state,
 					  const char *arg)
@@ -74,10 +74,8 @@
  
 	cros-ec-keyb {
 		compatible = "google,cros-ec-keyb";
-		google,key-rows = <8>;
-		google,key-columns = <13>;
-		google,repeat-delay-ms = <240>;
-		google,repeat-rate-ms = <30>;
+		keypad,num-rows = <8>;
+		keypad,num-columns = <13>;
 		google,ghost-filter;
 		/*
 		 * Keymap entries take the form of 0xRRCCKKKK where
@@ -18,8 +18,8 @@
  
 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.
+The board name is 'sandbox' but the vendor name is unset, so there is a
+single board in board/sandbox.
  
 CONFIG_SANDBOX_BIG_ENDIAN should be defined when running on big-endian
 machines.
@@ -52,12 +52,15 @@
 How to configure it
 ===================
  
-For most cases of using patman for U-Boot development, patman will
-locate and use the file 'doc/git-mailrc' in your U-Boot directory.
-This contains most of the aliases you will need.
+For most cases of using patman for U-Boot development, patman can use the
+file 'doc/git-mailrc' in your U-Boot directory to supply the email aliases
+you need. To make this work, tell git where to find the file by typing
+this once:
  
-For Linux the 'scripts/get_maintainer.pl' handles figuring out where
-to send patches pretty well.
+    git config sendemail.aliasesfile doc/git-mailrc
+
+For both Linux and U-Boot the 'scripts/get_maintainer.pl' handles figuring
+out where to send patches pretty well.
  
 During the first run patman creates a config file for you by taking the default
 user name and email address from the global .gitconfig file.
@@ -392,7 +392,8 @@
                    "Or do something like this\n"
                    "git config sendemail.to u-boot@lists.denx.de")
             return
-    cc = BuildEmailList(series.get('cc'), '--cc', alias, raise_on_error)
+    cc = BuildEmailList(list(set(series.get('cc')) - set(series.get('to'))),
+                        '--cc', alias, raise_on_error)
     if self_only:
         to = BuildEmailList([os.getenv('USER')], '--to', alias, raise_on_error)
         cc = []
@@ -139,6 +139,9 @@
         # Initially we have no output. Prepare the input line string
         out = []
         line = line.rstrip('\n')
+
+        commit_match = re_commit.match(line) if self.is_log else None
+
         if self.is_log:
             if line[:4] == '    ':
                 line = line[4:]
@@ -146,7 +149,6 @@
         # Handle state transition and skipping blank lines
         series_tag_match = re_series_tag.match(line)
         commit_tag_match = re_commit_tag.match(line)
-        commit_match = re_commit.match(line) if self.is_log else None
         cover_cc_match = re_cover_cc.match(line)
         signoff_match = re_signoff.match(line)
         tag_match = None
@@ -94,6 +94,9 @@
             cmd: The git command we would have run
             process_tags: Process tags as if they were aliases
         """
+        to_set = set(gitutil.BuildEmailList(self.to));
+        cc_set = set(gitutil.BuildEmailList(self.cc));
+
         col = terminal.Color()
         print 'Dry run, so not doing much. But I would do this:'
         print
  
  
@@ -106,24 +109,16 @@
             commit = self.commits[upto]
             print col.Color(col.GREEN, '   %s' % args[upto])
             cc_list = list(self._generated_cc[commit.patch])
-
-            # Skip items in To list
-            if 'to' in self:
-                try:
-                    map(cc_list.remove, gitutil.BuildEmailList(self.to))
-                except ValueError:
-                    pass
-
-            for email in cc_list:
+            for email in set(cc_list) - to_set - cc_set:
                 if email == None:
                     email = col.Color(col.YELLOW, "<alias '%s' not found>"
                             % tag)
                 if email:
                     print '      Cc: ',email
         print
-        for item in gitutil.BuildEmailList(self.get('to', '<none>')):
+        for item in to_set:
             print 'To:\t ', item
-        for item in gitutil.BuildEmailList(self.cc):
+        for item in cc_set - to_set:
             print 'Cc:\t ', item
         print 'Version: ', self.get('version')
         print 'Prefix:\t ', self.get('prefix')
@@ -131,7 +126,7 @@
             print 'Cover: %d lines' % len(self.cover)
             cover_cc = gitutil.BuildEmailList(self.get('cover_cc', ''))
             all_ccs = itertools.chain(cover_cc, *self._generated_cc.values())
-            for email in set(all_ccs):
+            for email in set(all_ccs) - to_set - cc_set:
                     print '      Cc: ',email
         if cmd:
             print 'Git command: %s' % cmd
@@ -230,7 +225,7 @@
 	    if add_maintainers:
                 list += get_maintainer.GetMaintainer(commit.patch)
             all_ccs += list
-            print >>fd, commit.patch, ', '.join(list)
+            print >>fd, commit.patch, ', '.join(set(list))
             self._generated_cc[commit.patch] = list
  
         if cover_fname:
...	...	@@ -6,6 +6,7 @@
6	6	#include <common.h>
7	7	#include <os.h>
8	8	#include <cli.h>
	9	+#include <malloc.h>
9	10	#include <asm/getopt.h>
10	11	#include <asm/io.h>
11	12	#include <asm/sections.h>
...	...	@@ -101,6 +102,25 @@
101	102	return 0;
102	103	}
103	104	SANDBOX_CMDLINE_OPT_SHORT(fdt, 'd', 1, "Specify U-Boot's control FDT");
	105	+
	106	+static int sandbox_cmdline_cb_default_fdt(struct sandbox_state *state,
	107	+ const char *arg)
	108	+{
	109	+ const char *fmt = "%s.dtb";
	110	+ char *fname;
	111	+ int len;
	112	+
	113	+ len = strlen(state->argv[0]) + strlen(fmt) + 1;
	114	+ fname = os_malloc(len);
	115	+ if (!fname)
	116	+ return -ENOMEM;
	117	+ snprintf(fname, len, fmt, state->argv[0]);
	118	+ state->fdt_fname = fname;
	119	+
	120	+ return 0;
	121	+}
	122	+SANDBOX_CMDLINE_OPT_SHORT(default_fdt, 'D', 0,
	123	+ "Use the default u-boot.dtb control FDT in U-Boot directory");
104	124
105	125	static int sandbox_cmdline_cb_interactive(struct sandbox_state *state,
106	126	const char *arg)
...	...	@@ -74,10 +74,8 @@
74	74
75	75	cros-ec-keyb {
76	76	compatible = "google,cros-ec-keyb";
77		- google,key-rows = <8>;
78		- google,key-columns = <13>;
79		- google,repeat-delay-ms = <240>;
80		- google,repeat-rate-ms = <30>;
	77	+ keypad,num-rows = <8>;
	78	+ keypad,num-columns = <13>;
81	79	google,ghost-filter;
82	80	/*
83	81	* Keymap entries take the form of 0xRRCCKKKK where
...	...	@@ -18,8 +18,8 @@
18	18
19	19	CONFIG_SANDBOX is defined when building a native board.
20	20
21		-The chosen vendor and board names are also 'sandbox', so there is a single
22		-board in board/sandbox.
	21	+The board name is 'sandbox' but the vendor name is unset, so there is a
	22	+single board in board/sandbox.
23	23
24	24	CONFIG_SANDBOX_BIG_ENDIAN should be defined when running on big-endian
25	25	machines.
...	...	@@ -52,12 +52,15 @@
52	52	How to configure it
53	53	===================
54	54
55		-For most cases of using patman for U-Boot development, patman will
56		-locate and use the file 'doc/git-mailrc' in your U-Boot directory.
57		-This contains most of the aliases you will need.
	55	+For most cases of using patman for U-Boot development, patman can use the
	56	+file 'doc/git-mailrc' in your U-Boot directory to supply the email aliases
	57	+you need. To make this work, tell git where to find the file by typing
	58	+this once:
58	59
59		-For Linux the 'scripts/get_maintainer.pl' handles figuring out where
60		-to send patches pretty well.
	60	+ git config sendemail.aliasesfile doc/git-mailrc
	61	+
	62	+For both Linux and U-Boot the 'scripts/get_maintainer.pl' handles figuring
	63	+out where to send patches pretty well.
61	64
62	65	During the first run patman creates a config file for you by taking the default
63	66	user name and email address from the global .gitconfig file.
...	...	@@ -392,7 +392,8 @@
392	392	"Or do something like this\n"
393	393	"git config sendemail.to u-boot@lists.denx.de")
394	394	return
395		- cc = BuildEmailList(series.get('cc'), '--cc', alias, raise_on_error)
	395	+ cc = BuildEmailList(list(set(series.get('cc')) - set(series.get('to'))),
	396	+ '--cc', alias, raise_on_error)
396	397	if self_only:
397	398	to = BuildEmailList([os.getenv('USER')], '--to', alias, raise_on_error)
398	399	cc = []
...	...	@@ -139,6 +139,9 @@
139	139	# Initially we have no output. Prepare the input line string
140	140	out = []
141	141	line = line.rstrip('\n')
	142	+
	143	+ commit_match = re_commit.match(line) if self.is_log else None
	144	+
142	145	if self.is_log:
143	146	if line[:4] == ' ':
144	147	line = line[4:]
...	...	@@ -146,7 +149,6 @@
146	149	# Handle state transition and skipping blank lines
147	150	series_tag_match = re_series_tag.match(line)
148	151	commit_tag_match = re_commit_tag.match(line)
149		- commit_match = re_commit.match(line) if self.is_log else None
150	152	cover_cc_match = re_cover_cc.match(line)
151	153	signoff_match = re_signoff.match(line)
152	154	tag_match = None
...	...	@@ -94,6 +94,9 @@
94	94	cmd: The git command we would have run
95	95	process_tags: Process tags as if they were aliases
96	96	"""
	97	+ to_set = set(gitutil.BuildEmailList(self.to));
	98	+ cc_set = set(gitutil.BuildEmailList(self.cc));
	99	+
97	100	col = terminal.Color()
98	101	print 'Dry run, so not doing much. But I would do this:'
99	102	print
100	103
101	104
...	...	@@ -106,24 +109,16 @@
106	109	commit = self.commits[upto]
107	110	print col.Color(col.GREEN, ' %s' % args[upto])
108	111	cc_list = list(self._generated_cc[commit.patch])
109		-
110		- # Skip items in To list
111		- if 'to' in self:
112		- try:
113		- map(cc_list.remove, gitutil.BuildEmailList(self.to))
114		- except ValueError:
115		- pass
116		-
117		- for email in cc_list:
	112	+ for email in set(cc_list) - to_set - cc_set:
118	113	if email == None:
119	114	email = col.Color(col.YELLOW, "<alias '%s' not found>"
120	115	% tag)
121	116	if email:
122	117	print ' Cc: ',email
123	118	print
124		- for item in gitutil.BuildEmailList(self.get('to', '<none>')):
	119	+ for item in to_set:
125	120	print 'To:\t ', item
126		- for item in gitutil.BuildEmailList(self.cc):
	121	+ for item in cc_set - to_set:
127	122	print 'Cc:\t ', item
128	123	print 'Version: ', self.get('version')
129	124	print 'Prefix:\t ', self.get('prefix')
...	...	@@ -131,7 +126,7 @@
131	126	print 'Cover: %d lines' % len(self.cover)
132	127	cover_cc = gitutil.BuildEmailList(self.get('cover_cc', ''))
133	128	all_ccs = itertools.chain(cover_cc, *self._generated_cc.values())
134		- for email in set(all_ccs):
	129	+ for email in set(all_ccs) - to_set - cc_set:
135	130	print ' Cc: ',email
136	131	if cmd:
137	132	print 'Git command: %s' % cmd
...	...	@@ -230,7 +225,7 @@
230	225	if add_maintainers:
231	226	list += get_maintainer.GetMaintainer(commit.patch)
232	227	all_ccs += list
233		- print >>fd, commit.patch, ', '.join(list)
	228	+ print >>fd, commit.patch, ', '.join(set(list))
234	229	self._generated_cc[commit.patch] = list
235	230
236	231	if cover_fname: