From: Rob Herring <robh@kernel.org>
To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Frank Rowand <frowand.list@gmail.com>,
Ley Foon Tan <lftan@altera.com>,
nios2-dev@lists.rocketboards.org
Subject: [PATCH v3 2/9] nios2: build .dtb files in dts directory
Date: Mon, 10 Sep 2018 10:03:56 -0500 [thread overview]
Message-ID: <20180910150403.19476-3-robh@kernel.org> (raw)
In-Reply-To: <20180910150403.19476-1-robh@kernel.org>
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 | 4 ++--
arch/nios2/boot/Makefile | 4 ----
arch/nios2/boot/dts/Makefile | 1 +
3 files changed, 3 insertions(+), 6 deletions(-)
create mode 100644 arch/nios2/boot/dts/Makefile
diff --git a/arch/nios2/Makefile b/arch/nios2/Makefile
index 8673a79dca9c..50eece1c6adb 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 2ba23a679732..007586094dde 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 000000000000..f66554cd5c45
--- /dev/null
+++ b/arch/nios2/boot/dts/Makefile
@@ -0,0 +1 @@
+# SPDX-License-Identifier: GPL-2.0
--
2.17.1
next prev parent reply other threads:[~2018-09-10 15:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-10 15:03 [PATCH v3 0/9] Devicetree build consolidation Rob Herring
2018-09-10 15:03 ` [PATCH v3 1/9] powerpc: build .dtb files in dts directory Rob Herring
2018-09-27 13:39 ` Rob Herring
2018-09-10 15:03 ` Rob Herring [this message]
2018-09-10 15:03 ` [PATCH v3 3/9] nios2: use common rules to build built-in dtb Rob Herring
2018-09-10 15:03 ` [PATCH v3 4/9] nios2: fix building all dtbs Rob Herring
2018-09-10 15:03 ` [PATCH v3 5/9] c6x: use common built-in dtb support Rob Herring
2018-09-10 15:04 ` [PATCH v3 6/9] kbuild: consolidate Devicetree dtb build rules Rob Herring
2018-09-11 15:40 ` Rob Herring
2018-09-12 1:00 ` Masahiro Yamada
2018-09-13 15:51 ` Geert Uytterhoeven
2018-09-23 10:31 ` Masahiro Yamada
2018-09-28 15:41 ` Rob Herring
2018-10-01 5:49 ` Masahiro Yamada
2018-10-01 13:25 ` Rob Herring
2018-10-01 14:48 ` Masahiro Yamada
2018-09-28 17:21 ` Andreas Färber
2018-09-28 18:41 ` Rob Herring
2018-10-01 7:53 ` Geert Uytterhoeven
2018-09-10 15:04 ` [PATCH v3 7/9] powerpc: enable building all dtbs Rob Herring
2018-09-10 15:04 ` [PATCH v3 8/9] c6x: " Rob Herring
2018-09-10 15:04 ` [PATCH v3 9/9] microblaze: " Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180910150403.19476-3-robh@kernel.org \
--to=robh@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=lftan@altera.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nios2-dev@lists.rocketboards.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).