diff options
| author | Paul Burton <paul.burton@imgtec.com> | 2017-06-02 15:02:08 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2017-06-15 05:48:15 -0400 |
| commit | bcd7c45e0d5a82be9a64b90050f0e09d41a50758 (patch) | |
| tree | 783c9cad6260b126e663092ee6aa4ced7b369329 | |
| parent | 1a73d9310e093fc3adffba4d0a67b9fab2ee3f63 (diff) | |
MIPS: .its targets depend on vmlinux
The .its targets require information about the kernel binary, such as
its entry point, which is extracted from the vmlinux ELF. We therefore
require that the ELF is built before the .its files are generated.
Declare this requirement in the Makefile such that make will ensure this
is always the case, otherwise in corner cases we can hit issues as the
.its is generated with an incorrect (either invalid or stale) entry
point.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: cf2a5e0bb4c6 ("MIPS: Support generating Flattened Image Trees (.itb)")
Cc: linux-mips@linux-mips.org
Cc: stable <stable@vger.kernel.org> # v4.9+
Patchwork: https://patchwork.linux-mips.org/patch/16179/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/boot/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index 2728a9a9c7c5..145b5ce8eb7e 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile | |||
| @@ -128,19 +128,19 @@ quiet_cmd_cpp_its_S = ITS $@ | |||
| 128 | -DADDR_BITS=$(ADDR_BITS) \ | 128 | -DADDR_BITS=$(ADDR_BITS) \ |
| 129 | -DADDR_CELLS=$(itb_addr_cells) | 129 | -DADDR_CELLS=$(itb_addr_cells) |
| 130 | 130 | ||
| 131 | $(obj)/vmlinux.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE | 131 | $(obj)/vmlinux.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE |
| 132 | $(call if_changed_dep,cpp_its_S,none,vmlinux.bin) | 132 | $(call if_changed_dep,cpp_its_S,none,vmlinux.bin) |
| 133 | 133 | ||
| 134 | $(obj)/vmlinux.gz.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE | 134 | $(obj)/vmlinux.gz.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE |
| 135 | $(call if_changed_dep,cpp_its_S,gzip,vmlinux.bin.gz) | 135 | $(call if_changed_dep,cpp_its_S,gzip,vmlinux.bin.gz) |
| 136 | 136 | ||
| 137 | $(obj)/vmlinux.bz2.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE | 137 | $(obj)/vmlinux.bz2.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE |
| 138 | $(call if_changed_dep,cpp_its_S,bzip2,vmlinux.bin.bz2) | 138 | $(call if_changed_dep,cpp_its_S,bzip2,vmlinux.bin.bz2) |
| 139 | 139 | ||
| 140 | $(obj)/vmlinux.lzma.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE | 140 | $(obj)/vmlinux.lzma.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE |
| 141 | $(call if_changed_dep,cpp_its_S,lzma,vmlinux.bin.lzma) | 141 | $(call if_changed_dep,cpp_its_S,lzma,vmlinux.bin.lzma) |
| 142 | 142 | ||
| 143 | $(obj)/vmlinux.lzo.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S FORCE | 143 | $(obj)/vmlinux.lzo.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE |
| 144 | $(call if_changed_dep,cpp_its_S,lzo,vmlinux.bin.lzo) | 144 | $(call if_changed_dep,cpp_its_S,lzo,vmlinux.bin.lzo) |
| 145 | 145 | ||
| 146 | quiet_cmd_itb-image = ITB $@ | 146 | quiet_cmd_itb-image = ITB $@ |