diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-04-16 17:47:43 +0300 |
|---|---|---|
| committer | Paul Burton <paul.burton@mips.com> | 2018-06-24 19:27:27 +0300 |
| commit | 67e09db507db3e1642ddce512a4313d20addd6e5 (patch) | |
| tree | c9cd9dcae2aae551470f27636166e3872f4168e7 | |
| parent | 321f95b643573d689ac1fb5b68b90044ba47d1a4 (diff) | |
| download | linux-67e09db507db3e1642ddce512a4313d20addd6e5.tar.xz | |
MIPS: boot: fix build rule of vmlinux.its.S
As Documentation/kbuild/makefile.txt says, it is a typical mistake
to forget the FORCE prerequisite for the rule invoked by if_changed.
Add the FORCE to the prerequisite, but it must be filtered-out from
the files passed to the 'cat' command. Because this rule generates
.vmlinux.its.S.cmd, vmlinux.its.S must be specified as targets so
that the .cmd file is included.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Patchwork: https://patchwork.linux-mips.org/patch/19097/
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: linux-kernel@vger.kernel.org
| -rw-r--r-- | arch/mips/boot/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index 981bcf81c648..6c7054efd839 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile @@ -118,10 +118,12 @@ ifeq ($(ADDR_BITS),64) itb_addr_cells = 2 endif +targets += vmlinux.its.S + quiet_cmd_its_cat = CAT $@ - cmd_its_cat = cat $^ >$@ + cmd_its_cat = cat $(filter-out $(PHONY), $^) >$@ -$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS)) +$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS)) FORCE $(call if_changed,its_cat) quiet_cmd_cpp_its_S = ITS $@ |