nios2: build .dtb files in dts directory (11886486) · Commits · 戴 / test

Align nios2 with other architectures which build the dtb files in the same directory as the dts files. This is also in line with most other build targets which are located in the same directory as the source. This move will help enable the 'dtbs' target which builds all the dtbs regardless of kernel config. This transition could break some scripts if they expect dtb files in the old location. Cc: Ley Foon Tan <lftan@altera.com> Cc: nios2-dev@lists.rocketboards.org Signed-off-by:

Rob Herring <robh@kernel.org>

arch/nios2/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,10 +59,10 @@ archclean:
		$(Q)$(MAKE) $(clean)=$(nios2-boot)

		%.dtb: \| scripts
		$(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@
		$(Q)$(MAKE) $(build)=$(nios2-boot)/dts $(nios2-boot)/dts/$@

		dtbs:
		$(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@
		$(Q)$(MAKE) $(build)=$(nios2-boot)/dts

		$(BOOT_TARGETS): vmlinux
		$(Q)$(MAKE) $(build)=$(nios2-boot) $(nios2-boot)/$@

arch/nios2/boot/Makefile

+0 −4

Original line number	Diff line number	Diff line
		@@ -47,10 +47,6 @@ obj-$(CONFIG_NIOS2_DTB_SOURCE_BOOL) += linked_dtb.o

		targets += $(dtb-y)

		# Rule to build device tree blobs with make command
		$(obj)/%.dtb: $(src)/dts/%.dts FORCE
		$(call if_changed_dep,dtc)

		$(obj)/dtbs: $(addprefix $(obj)/, $(dtb-y))

		install:

arch/nios2/boot/dts/Makefile

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0

Admin message