diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-12-12 03:09:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-12-12 03:09:03 -0500 |
| commit | 3459f0d78ffe27a1b341c22eb158b622eaaea3fc (patch) | |
| tree | 715b0575eec541d0181876ad367ca5480cdcecf3 /scripts/Kbuild.include | |
| parent | 9fc81d87420d0d3fd62d5e5529972c0ad9eab9cc (diff) | |
| parent | bee2782f30f66898be3f74ad02e4d1f87a969694 (diff) | |
Merge branch 'linus' into perf/urgent, to pick up the upstream merged bits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/Kbuild.include')
| -rw-r--r-- | scripts/Kbuild.include | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 65e7b08bb2cc..5374b1bdf02f 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include | |||
| @@ -179,6 +179,12 @@ build := -f $(srctree)/scripts/Makefile.build obj | |||
| 179 | # $(Q)$(MAKE) $(modbuiltin)=dir | 179 | # $(Q)$(MAKE) $(modbuiltin)=dir |
| 180 | modbuiltin := -f $(srctree)/scripts/Makefile.modbuiltin obj | 180 | modbuiltin := -f $(srctree)/scripts/Makefile.modbuiltin obj |
| 181 | 181 | ||
| 182 | ### | ||
| 183 | # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.dtbinst obj= | ||
| 184 | # Usage: | ||
| 185 | # $(Q)$(MAKE) $(dtbinst)=dir | ||
| 186 | dtbinst := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.dtbinst obj | ||
| 187 | |||
| 182 | # Prefix -I with $(srctree) if it is not an absolute path. | 188 | # Prefix -I with $(srctree) if it is not an absolute path. |
| 183 | # skip if -I has no parameter | 189 | # skip if -I has no parameter |
| 184 | addtree = $(if $(patsubst -I%,%,$(1)), \ | 190 | addtree = $(if $(patsubst -I%,%,$(1)), \ |
