Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: Kbuild: Use dtc's -d (dependency) option dtc: Implement -d option to write out a dependency file kbuild: Fix comment in Makefile.lib scripts/genksyms: clean lex/yacc generated files kbuild: Correctly deal with make options which contain an "s"

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: Kbuild: Use dtc's -d (dependency) option dtc: Implement -d option to write out a dependency file kbuild: Fix comment in Makefile.lib scripts/genksyms: clean lex/yacc generated files kbuild: Correctly deal with make options which contain an "s"
Linus Torvalds
2 parents 53999bf34d 7c43185138
Showing 10 changed files Side-by-side Diff
Makefile
arch/arm/boot/Makefile
arch/microblaze/boot/Makefile
arch/openrisc/boot/Makefile
arch/powerpc/boot/Makefile
scripts/Makefile.lib
scripts/dtc/dtc.c
scripts/dtc/srcpos.c
scripts/dtc/srcpos.h
scripts/genksyms/Makefile
@@ -312,7 +312,7 @@
 # If the user is running make -s (silent mode), suppress echoing of
 # commands
  
-ifneq ($(findstring s,$(MAKEFLAGS)),)
+ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
   quiet=silent_
 endif
  
@@ -59,9 +59,11 @@
  
 endif
  
+targets += $(dtb-y)
+
 # Rule to build device tree blobs
-$(obj)/%.dtb: $(src)/dts/%.dts
-	$(call cmd,dtc)
+$(obj)/%.dtb: $(src)/dts/%.dts FORCE
+	$(call if_changed_dep,dtc)
  
 $(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
  
@@ -53,7 +53,7 @@
 DTC_FLAGS := -p 1024
  
 $(obj)/%.dtb: $(src)/dts/%.dts FORCE
-	$(call cmd,dtc)
+	$(call if_changed_dep,dtc)
  
 clean-files += *.dtb simpleImage.*.unstrip linux.bin.ub
@@ -11,6 +11,6 @@
  
 #DTC_FLAGS ?= -p 1024
  
-$(obj)/%.dtb: $(src)/dts/%.dts
-	$(call cmd,dtc)
+$(obj)/%.dtb: $(src)/dts/%.dts FORCE
+	$(call if_changed_dep,dtc)
@@ -345,8 +345,8 @@
 	$(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
  
 # Rule to build device tree blobs
-$(obj)/%.dtb: $(src)/dts/%.dts
-	$(call cmd,dtc)
+$(obj)/%.dtb: $(src)/dts/%.dts FORCE
+	$(call if_changed_dep,dtc)
  
 # If there isn't a platform selected then just strip the vmlinux.
 ifeq (,$(image-y))
@@ -93,9 +93,9 @@
 # already
 # $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will 
 # end up in (or would, if it gets compiled in)
-# Note: It's possible that one object gets potentially linked into more
-#       than one module. In that case KBUILD_MODNAME will be set to foo_bar,
-#       where foo and bar are the name of the modules.
+# Note: Files that end up in two or more modules are compiled without the
+#       KBUILD_MODNAME definition. The reason is that any made-up name would
+#       differ in different configs.
 name-fix = $(subst $(comma),_,$(subst -,_,$1))
 basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"
 modname_flags  = $(if $(filter 1,$(words $(modname))),\
@@ -264,7 +264,7 @@
 	$(call cmd,dt_S_dtb)
  
 quiet_cmd_dtc = DTC     $@
-cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $<
+cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $<
  
 # Bzip2
 # ---------------------------------------------------------------------------
@@ -71,6 +71,7 @@
 	fprintf(stderr, "\t\t\tasm - assembler source\n");
 	fprintf(stderr, "\t-V <output version>\n");
 	fprintf(stderr, "\t\tBlob version to produce, defaults to %d (relevant for dtb\n\t\tand asm output only)\n", DEFAULT_FDT_VERSION);
+	fprintf(stderr, "\t-d <output dependency file>\n");
 	fprintf(stderr, "\t-R <number>\n");
 	fprintf(stderr, "\t\tMake space for <number> reserve map entries (relevant for \n\t\tdtb and asm output only)\n");
 	fprintf(stderr, "\t-S <bytes>\n");
@@ -99,6 +100,7 @@
 	const char *inform = "dts";
 	const char *outform = "dts";
 	const char *outname = "-";
+	const char *depname = NULL;
 	int force = 0, check = 0, sort = 0;
 	const char *arg;
 	int opt;
@@ -111,7 +113,8 @@
 	minsize    = 0;
 	padsize    = 0;
  
-	while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:vH:s")) != EOF) {
+	while ((opt = getopt(argc, argv, "hI:O:o:V:d:R:S:p:fcqb:vH:s"))
+			!= EOF) {
 		switch (opt) {
 		case 'I':
 			inform = optarg;
@@ -125,6 +128,9 @@
 		case 'V':
 			outversion = strtol(optarg, NULL, 0);
 			break;
+		case 'd':
+			depname = optarg;
+			break;
 		case 'R':
 			reservenum = strtol(optarg, NULL, 0);
 			break;
@@ -188,6 +194,14 @@
 	fprintf(stderr, "DTC: %s->%s  on file \"%s\"\n",
 		inform, outform, arg);
  
+	if (depname) {
+		depfile = fopen(depname, "w");
+		if (!depfile)
+			die("Couldn't open dependency file %s: %s\n", depname,
+			    strerror(errno));
+		fprintf(depfile, "%s:", outname);
+	}
+
 	if (streq(inform, "dts"))
 		bi = dt_from_source(arg);
 	else if (streq(inform, "fs"))
@@ -196,6 +210,11 @@
 		bi = dt_from_blob(arg);
 	else
 		die("Unknown input format \"%s\"\n", inform);
+
+	if (depfile) {
+		fputc('\n', depfile);
+		fclose(depfile);
+	}
  
 	if (cmdline_boot_cpuid != -1)
 		bi->boot_cpuid_phys = cmdline_boot_cpuid;
@@ -40,6 +40,7 @@
 	return NULL;
 }
  
+FILE *depfile; /* = NULL */
 struct srcfile_state *current_srcfile; /* = NULL */
  
 /* Detect infinite include recursion. */
@@ -66,6 +67,9 @@
 			die("Couldn't open \"%s\": %s\n", fname,
 			    strerror(errno));
 	}
+
+	if (depfile)
+		fprintf(depfile, " %s", fullname);
  
 	if (fullnamep)
 		*fullnamep = fullname;
@@ -30,6 +30,7 @@
 	struct srcfile_state *prev;
 };
  
+extern FILE *depfile; /* = NULL */
 extern struct srcfile_state *current_srcfile; /* = NULL */
  
 FILE *srcfile_relative_open(const char *fname, char **fullnamep);
@@ -10,4 +10,6 @@
  
 # dependencies on generated files need to be listed explicitly
 $(obj)/lex.lex.o: $(obj)/keywords.hash.c $(obj)/parse.tab.h
+
+clean-files	:= keywords.hash.c lex.lex.c parse.tab.c parse.tab.h
...	...	@@ -312,7 +312,7 @@
312	312	# If the user is running make -s (silent mode), suppress echoing of
313	313	# commands
314	314
315		-ifneq ($(findstring s,$(MAKEFLAGS)),)
	315	+ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
316	316	quiet=silent_
317	317	endif
318	318
...	...	@@ -59,9 +59,11 @@
59	59
60	60	endif
61	61
	62	+targets += $(dtb-y)
	63	+
62	64	# Rule to build device tree blobs
63		-$(obj)/%.dtb: $(src)/dts/%.dts
64		- $(call cmd,dtc)
	65	+$(obj)/%.dtb: $(src)/dts/%.dts FORCE
	66	+ $(call if_changed_dep,dtc)
65	67
66	68	$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))
67	69
...	...	@@ -53,7 +53,7 @@
53	53	DTC_FLAGS := -p 1024
54	54
55	55	$(obj)/%.dtb: $(src)/dts/%.dts FORCE
56		- $(call cmd,dtc)
	56	+ $(call if_changed_dep,dtc)
57	57
58	58	clean-files += .dtb simpleImage..unstrip linux.bin.ub
...	...	@@ -11,6 +11,6 @@
11	11
12	12	#DTC_FLAGS ?= -p 1024
13	13
14		-$(obj)/%.dtb: $(src)/dts/%.dts
15		- $(call cmd,dtc)
	14	+$(obj)/%.dtb: $(src)/dts/%.dts FORCE
	15	+ $(call if_changed_dep,dtc)
...	...	@@ -345,8 +345,8 @@
345	345	$(call if_changed,wrap,treeboot-$,,$(obj)/$.dtb)
346	346
347	347	# Rule to build device tree blobs
348		-$(obj)/%.dtb: $(src)/dts/%.dts
349		- $(call cmd,dtc)
	348	+$(obj)/%.dtb: $(src)/dts/%.dts FORCE
	349	+ $(call if_changed_dep,dtc)
350	350
351	351	# If there isn't a platform selected then just strip the vmlinux.
352	352	ifeq (,$(image-y))
...	...	@@ -93,9 +93,9 @@
93	93	# already
94	94	# $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will
95	95	# end up in (or would, if it gets compiled in)
96		-# Note: It's possible that one object gets potentially linked into more
97		-# than one module. In that case KBUILD_MODNAME will be set to foo_bar,
98		-# where foo and bar are the name of the modules.
	96	+# Note: Files that end up in two or more modules are compiled without the
	97	+# KBUILD_MODNAME definition. The reason is that any made-up name would
	98	+# differ in different configs.
99	99	name-fix = $(subst $(comma),_,$(subst -,_,$1))
100	100	basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"
101	101	modname_flags = $(if $(filter 1,$(words $(modname))),\
...	...	@@ -264,7 +264,7 @@
264	264	$(call cmd,dt_S_dtb)
265	265
266	266	quiet_cmd_dtc = DTC $@
267		-cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) $<
	267	+cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $<
268	268
269	269	# Bzip2
270	270	# ---------------------------------------------------------------------------
...	...	@@ -71,6 +71,7 @@
71	71	fprintf(stderr, "\t\t\tasm - assembler source\n");
72	72	fprintf(stderr, "\t-V <output version>\n");
73	73	fprintf(stderr, "\t\tBlob version to produce, defaults to %d (relevant for dtb\n\t\tand asm output only)\n", DEFAULT_FDT_VERSION);
	74	+ fprintf(stderr, "\t-d <output dependency file>\n");
74	75	fprintf(stderr, "\t-R <number>\n");
75	76	fprintf(stderr, "\t\tMake space for <number> reserve map entries (relevant for \n\t\tdtb and asm output only)\n");
76	77	fprintf(stderr, "\t-S <bytes>\n");
...	...	@@ -99,6 +100,7 @@
99	100	const char *inform = "dts";
100	101	const char *outform = "dts";
101	102	const char *outname = "-";
	103	+ const char *depname = NULL;
102	104	int force = 0, check = 0, sort = 0;
103	105	const char *arg;
104	106	int opt;
...	...	@@ -111,7 +113,8 @@
111	113	minsize = 0;
112	114	padsize = 0;
113	115
114		- while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:vH:s")) != EOF) {
	116	+ while ((opt = getopt(argc, argv, "hI:O:o:V:d:R:S:p:fcqb:vH:s"))
	117	+ != EOF) {
115	118	switch (opt) {
116	119	case 'I':
117	120	inform = optarg;
...	...	@@ -125,6 +128,9 @@
125	128	case 'V':
126	129	outversion = strtol(optarg, NULL, 0);
127	130	break;
	131	+ case 'd':
	132	+ depname = optarg;
	133	+ break;
128	134	case 'R':
129	135	reservenum = strtol(optarg, NULL, 0);
130	136	break;
...	...	@@ -188,6 +194,14 @@
188	194	fprintf(stderr, "DTC: %s->%s on file \"%s\"\n",
189	195	inform, outform, arg);
190	196
	197	+ if (depname) {
	198	+ depfile = fopen(depname, "w");
	199	+ if (!depfile)
	200	+ die("Couldn't open dependency file %s: %s\n", depname,
	201	+ strerror(errno));
	202	+ fprintf(depfile, "%s:", outname);
	203	+ }
	204	+
191	205	if (streq(inform, "dts"))
192	206	bi = dt_from_source(arg);
193	207	else if (streq(inform, "fs"))
...	...	@@ -196,6 +210,11 @@
196	210	bi = dt_from_blob(arg);
197	211	else
198	212	die("Unknown input format \"%s\"\n", inform);
	213	+
	214	+ if (depfile) {
	215	+ fputc('\n', depfile);
	216	+ fclose(depfile);
	217	+ }
199	218
200	219	if (cmdline_boot_cpuid != -1)
201	220	bi->boot_cpuid_phys = cmdline_boot_cpuid;
...	...	@@ -40,6 +40,7 @@
40	40	return NULL;
41	41	}
42	42
	43	+FILE depfile; / = NULL */
43	44	struct srcfile_state current_srcfile; / = NULL */
44	45
45	46	/* Detect infinite include recursion. */
...	...	@@ -66,6 +67,9 @@
66	67	die("Couldn't open \"%s\": %s\n", fname,
67	68	strerror(errno));
68	69	}
	70	+
	71	+ if (depfile)
	72	+ fprintf(depfile, " %s", fullname);
69	73
70	74	if (fullnamep)
71	75	*fullnamep = fullname;
...	...	@@ -30,6 +30,7 @@
30	30	struct srcfile_state *prev;
31	31	};
32	32
	33	+extern FILE depfile; / = NULL */
33	34	extern struct srcfile_state current_srcfile; / = NULL */
34	35
35	36	FILE srcfile_relative_open(const char fname, char **fullnamep);
...	...	@@ -10,4 +10,6 @@
10	10
11	11	# dependencies on generated files need to be listed explicitly
12	12	$(obj)/lex.lex.o: $(obj)/keywords.hash.c $(obj)/parse.tab.h
	13	+
	14	+clean-files := keywords.hash.c lex.lex.c parse.tab.c parse.tab.h