Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Allow platform to specify multiple its.S files

In preparation for splitting arch/mips/generic/vmlinux.its.S into
multiple files such that it doesn't become a conflict magnet as boards
are added, allow platforms to specify a list of image tree source files
which will be concatenated to form the final source used to build the
image tree.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16938/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Paul Burton and committed by
Ralf Baechle
436c6a44 846fbcfe

+15 -6
+2 -1
arch/mips/Makefile
··· 290 290 291 291 bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ 292 292 VMLINUX_ENTRY_ADDRESS=$(entry-y) \ 293 - PLATFORM="$(platform-y)" 293 + PLATFORM="$(platform-y)" \ 294 + ITS_INPUTS="$(its-y)" 294 295 ifdef CONFIG_32BIT 295 296 bootvars-y += ADDR_BITS=32 296 297 endif
+11 -5
arch/mips/boot/Makefile
··· 118 118 itb_addr_cells = 2 119 119 endif 120 120 121 + quiet_cmd_its_cat = CAT $@ 122 + cmd_its_cat = cat $^ >$@ 123 + 124 + $(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS)) 125 + $(call if_changed,its_cat) 126 + 121 127 quiet_cmd_cpp_its_S = ITS $@ 122 128 cmd_cpp_its_S = $(CPP) $(cpp_flags) -P -C -o $@ $< \ 123 129 -DKERNEL_NAME="\"Linux $(KERNELRELEASE)\"" \ ··· 134 128 -DADDR_BITS=$(ADDR_BITS) \ 135 129 -DADDR_CELLS=$(itb_addr_cells) 136 130 137 - $(obj)/vmlinux.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE 131 + $(obj)/vmlinux.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE 138 132 $(call if_changed_dep,cpp_its_S,none,vmlinux.bin) 139 133 140 - $(obj)/vmlinux.gz.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE 134 + $(obj)/vmlinux.gz.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE 141 135 $(call if_changed_dep,cpp_its_S,gzip,vmlinux.bin.gz) 142 136 143 - $(obj)/vmlinux.bz2.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE 137 + $(obj)/vmlinux.bz2.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE 144 138 $(call if_changed_dep,cpp_its_S,bzip2,vmlinux.bin.bz2) 145 139 146 - $(obj)/vmlinux.lzma.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE 140 + $(obj)/vmlinux.lzma.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE 147 141 $(call if_changed_dep,cpp_its_S,lzma,vmlinux.bin.lzma) 148 142 149 - $(obj)/vmlinux.lzo.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE 143 + $(obj)/vmlinux.lzo.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE 150 144 $(call if_changed_dep,cpp_its_S,lzo,vmlinux.bin.lzo) 151 145 152 146 quiet_cmd_itb-image = ITB $@
+2
arch/mips/generic/Platform
··· 12 12 cflags-$(CONFIG_MIPS_GENERIC) += -I$(srctree)/arch/mips/include/asm/mach-generic 13 13 load-$(CONFIG_MIPS_GENERIC) += 0xffffffff80100000 14 14 all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb 15 + 16 + its-y := vmlinux.its.S