summaryrefslogtreecommitdiffstats
path: root/arch/nios2
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2015-10-07 19:21:18 -0500
committerRob Herring <robh@kernel.org>2018-10-02 09:22:49 -0500
commit118864869805123bf82d666062542440a0fda5dd (patch)
tree05178cf807513b79d3df68b3724ef96b406a6009 /arch/nios2
parent1acf1cf8638a801e67666425d8663f813e1dae8a (diff)
downloadlinux-0-day-118864869805123bf82d666062542440a0fda5dd.tar.gz
linux-0-day-118864869805123bf82d666062542440a0fda5dd.tar.xz
nios2: build .dtb files in dts directory
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>
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/Makefile4
-rw-r--r--arch/nios2/boot/Makefile4
-rw-r--r--arch/nios2/boot/dts/Makefile1
3 files changed, 3 insertions, 6 deletions
diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile
index 8673a79dca9c6..50eece1c6adbc 100644
--- a/arch/nios2/Makefile
+++ b/arch/nios2/Makefile
@@ -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)/$@
diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile
index 2ba23a6797320..007586094dde8 100644
--- a/arch/nios2/boot/Makefile
+++ b/arch/nios2/boot/Makefile
@@ -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:
diff --git a/arch/nios2/boot/dts/Makefile b/arch/nios2/boot/dts/Makefile
new file mode 100644
index 0000000000000..f66554cd5c451
--- /dev/null
+++ b/arch/nios2/boot/dts/Makefile
@@ -0,0 +1 @@
+# SPDX-License-Identifier: GPL-2.0