* [PATCH REPOST] xtensa: use new common dtc rule
@ 2013-01-02 18:27 Stephen Warren
2013-01-03 23:15 ` Chris Zankel
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Warren @ 2013-01-02 18:27 UTC (permalink / raw)
To: Chris Zankel, Max Filippov; +Cc: linux-xtensa, linux-kernel, Stephen Warren
From: Stephen Warren <swarren@nvidia.com>
The current rules have the .dtb files build in a different directory
from the .dts files. This patch changes xtensa to use the generic dtb
rule which builds .dtb files in the same directory as the source .dts.
This requires moving parts of arch/xtensa/boot/Makefile into newly
created arch/xtensa/boot/dts/Makefile, and updating arch/xtensa/Makefile
to call the new Makefile.
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: linux-xtensa@linux-xtensa.org
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
This patch applies recent dtc-rule-related changes to the xtensa arch.
They couldn't be applied along with the similar changes for other archs
due to dependencies on other xtensa changes. This should apply OK now to
Linus's tree, or for 3.9.
Note: I have not tested this recently.
arch/xtensa/Makefile | 4 ++--
arch/xtensa/boot/Makefile | 12 ------------
arch/xtensa/boot/dts/Makefile | 15 +++++++++++++++
3 files changed, 17 insertions(+), 14 deletions(-)
create mode 100644 arch/xtensa/boot/dts/Makefile
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 0aa7270..48c1a5b 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -88,7 +88,7 @@ core-y += $(buildvar) $(buildplf)
libs-y += arch/xtensa/lib/ $(LIBGCC)
ifneq ($(CONFIG_BUILTIN_DTB),"")
-core-$(CONFIG_OF) += arch/xtensa/boot/
+core-$(CONFIG_OF) += arch/xtensa/boot/dts/
endif
boot := arch/xtensa/boot
@@ -101,7 +101,7 @@ zImage: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $@
%.dtb:
- $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
+ $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
define archhelp
@echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile
index 818647e..64ffc4b 100644
--- a/arch/xtensa/boot/Makefile
+++ b/arch/xtensa/boot/Makefile
@@ -25,18 +25,6 @@ bootdir-$(CONFIG_XTENSA_PLATFORM_ISS) += boot-elf
bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf boot-uboot
bootdir-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += boot-redboot boot-elf boot-uboot
-
-BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o
-ifneq ($(CONFIG_BUILTIN_DTB),"")
-obj-$(CONFIG_OF) += $(BUILTIN_DTB)
-endif
-
-# Rule to build device tree blobs
-$(obj)/%.dtb: $(src)/dts/%.dts FORCE
- $(call if_changed_dep,dtc)
-
-clean-files := *.dtb.S
-
zImage Image: $(bootdir-y)
$(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \
diff --git a/arch/xtensa/boot/dts/Makefile b/arch/xtensa/boot/dts/Makefile
new file mode 100644
index 0000000..5f711bb
--- /dev/null
+++ b/arch/xtensa/boot/dts/Makefile
@@ -0,0 +1,15 @@
+#
+# arch/xtensa/boot/dts/Makefile
+#
+# This file is subject to the terms and conditions of the GNU General Public
+# License. See the file "COPYING" in the main directory of this archive
+# for more details.
+#
+#
+
+BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o
+ifneq ($(CONFIG_BUILTIN_DTB),"")
+obj-$(CONFIG_OF) += $(BUILTIN_DTB)
+endif
+
+clean-files := *.dtb.S
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH REPOST] xtensa: use new common dtc rule
2013-01-02 18:27 [PATCH REPOST] xtensa: use new common dtc rule Stephen Warren
@ 2013-01-03 23:15 ` Chris Zankel
2013-01-03 23:24 ` Max Filippov
0 siblings, 1 reply; 3+ messages in thread
From: Chris Zankel @ 2013-01-03 23:15 UTC (permalink / raw)
To: Stephen Warren; +Cc: Max Filippov, linux-xtensa, linux-kernel, Stephen Warren
Hi Stephen,
Thanks for the patch. I have added it to the 'for_next' tree. Max, since
you added that feature for Xtensa, any comments before I ask to pull?
-Chris
On 1/2/13 7:27 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> The current rules have the .dtb files build in a different directory
> from the .dts files. This patch changes xtensa to use the generic dtb
> rule which builds .dtb files in the same directory as the source .dts.
>
> This requires moving parts of arch/xtensa/boot/Makefile into newly
> created arch/xtensa/boot/dts/Makefile, and updating arch/xtensa/Makefile
> to call the new Makefile.
>
> Cc: Chris Zankel <chris@zankel.net>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: linux-xtensa@linux-xtensa.org
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> ---
> This patch applies recent dtc-rule-related changes to the xtensa arch.
> They couldn't be applied along with the similar changes for other archs
> due to dependencies on other xtensa changes. This should apply OK now to
> Linus's tree, or for 3.9.
>
> Note: I have not tested this recently.
>
> arch/xtensa/Makefile | 4 ++--
> arch/xtensa/boot/Makefile | 12 ------------
> arch/xtensa/boot/dts/Makefile | 15 +++++++++++++++
> 3 files changed, 17 insertions(+), 14 deletions(-)
> create mode 100644 arch/xtensa/boot/dts/Makefile
>
> diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
> index 0aa7270..48c1a5b 100644
> --- a/arch/xtensa/Makefile
> +++ b/arch/xtensa/Makefile
> @@ -88,7 +88,7 @@ core-y += $(buildvar) $(buildplf)
> libs-y += arch/xtensa/lib/ $(LIBGCC)
>
> ifneq ($(CONFIG_BUILTIN_DTB),"")
> -core-$(CONFIG_OF) += arch/xtensa/boot/
> +core-$(CONFIG_OF) += arch/xtensa/boot/dts/
> endif
>
> boot := arch/xtensa/boot
> @@ -101,7 +101,7 @@ zImage: vmlinux
> $(Q)$(MAKE) $(build)=$(boot) $@
>
> %.dtb:
> - $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
> + $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
>
> define archhelp
> @echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'
> diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile
> index 818647e..64ffc4b 100644
> --- a/arch/xtensa/boot/Makefile
> +++ b/arch/xtensa/boot/Makefile
> @@ -25,18 +25,6 @@ bootdir-$(CONFIG_XTENSA_PLATFORM_ISS) += boot-elf
> bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf boot-uboot
> bootdir-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += boot-redboot boot-elf boot-uboot
>
> -
> -BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o
> -ifneq ($(CONFIG_BUILTIN_DTB),"")
> -obj-$(CONFIG_OF) += $(BUILTIN_DTB)
> -endif
> -
> -# Rule to build device tree blobs
> -$(obj)/%.dtb: $(src)/dts/%.dts FORCE
> - $(call if_changed_dep,dtc)
> -
> -clean-files := *.dtb.S
> -
> zImage Image: $(bootdir-y)
>
> $(bootdir-y): $(addprefix $(obj)/,$(subdir-y)) \
> diff --git a/arch/xtensa/boot/dts/Makefile b/arch/xtensa/boot/dts/Makefile
> new file mode 100644
> index 0000000..5f711bb
> --- /dev/null
> +++ b/arch/xtensa/boot/dts/Makefile
> @@ -0,0 +1,15 @@
> +#
> +# arch/xtensa/boot/dts/Makefile
> +#
> +# This file is subject to the terms and conditions of the GNU General Public
> +# License. See the file "COPYING" in the main directory of this archive
> +# for more details.
> +#
> +#
> +
> +BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_BUILTIN_DTB)).dtb.o
> +ifneq ($(CONFIG_BUILTIN_DTB),"")
> +obj-$(CONFIG_OF) += $(BUILTIN_DTB)
> +endif
> +
> +clean-files := *.dtb.S
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH REPOST] xtensa: use new common dtc rule
2013-01-03 23:15 ` Chris Zankel
@ 2013-01-03 23:24 ` Max Filippov
0 siblings, 0 replies; 3+ messages in thread
From: Max Filippov @ 2013-01-03 23:24 UTC (permalink / raw)
To: Chris Zankel; +Cc: Stephen Warren, linux-xtensa, linux-kernel, Stephen Warren
On Fri, Jan 4, 2013 at 3:15 AM, Chris Zankel <chris@zankel.net> wrote:
> Hi Stephen,
>
> Thanks for the patch. I have added it to the 'for_next' tree. Max, since you
> added that feature for Xtensa, any comments before I ask to pull?
No objections. In fact this resent version is almost identical to the one
queued on my xtensa-fixes-for-upstream branch:
https://github.com/jcmvbkbc/linux-xtensa/commit/2442a9c5df9ea9a2fd289fbd4e5de9a9810cab32
> On 1/2/13 7:27 PM, Stephen Warren wrote:
>>
>> From: Stephen Warren <swarren@nvidia.com>
>>
>> The current rules have the .dtb files build in a different directory
>> from the .dts files. This patch changes xtensa to use the generic dtb
>> rule which builds .dtb files in the same directory as the source .dts.
>>
>> This requires moving parts of arch/xtensa/boot/Makefile into newly
>> created arch/xtensa/boot/dts/Makefile, and updating arch/xtensa/Makefile
>> to call the new Makefile.
--
Thanks.
-- Max
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-03 23:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-02 18:27 [PATCH REPOST] xtensa: use new common dtc rule Stephen Warren
2013-01-03 23:15 ` Chris Zankel
2013-01-03 23:24 ` Max Filippov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.