[PATCH 0/3] .gitignore / kbuild: of: ignore and clean *.dtb and *.dtb.S globally

[PATCH 0/3] .gitignore / kbuild: of: ignore and clean *.dtb and *.dtb.S globally

[Masahiro Yamada]

Recently, overlay test data were added to of/unittest-data,
but I notice they are not ignored or cleaned.  Actually, we
often forget .gitignore / clean-files at the first commit.

We have DT things in various places in the kernel tree,
so I think it is OK to move them to the top-level.

Is this OK from the DT point of view?



Masahiro Yamada (3):
  .gitignore: sort normal pattern rules alphabetically
  .gitignore: move *.dtb and *.dtb.S patterns to the top-level
    .gitignore
  kbuild: clean up *.dtb and *.dtb.S patterns from top-level Makefile

 .gitignore                          | 44 +++++++++++++++++++------------------
 Makefile                            |  2 +-
 arch/arc/boot/.gitignore            |  1 -
 arch/arm/boot/.gitignore            |  1 -
 arch/arm64/boot/dts/.gitignore      |  1 -
 arch/metag/boot/.gitignore          |  1 -
 arch/microblaze/boot/.gitignore     |  1 -
 arch/mips/boot/.gitignore           |  1 -
 arch/nios2/boot/.gitignore          |  1 -
 arch/powerpc/boot/.gitignore        |  1 -
 arch/xtensa/boot/.gitignore         |  1 -
 drivers/of/unittest-data/.gitignore |  2 --
 12 files changed, 24 insertions(+), 33 deletions(-)
 delete mode 100644 arch/arm64/boot/dts/.gitignore
 delete mode 100644 drivers/of/unittest-data/.gitignore

-- 
2.7.4

[PATCH 1/3] .gitignore: sort normal pattern rules alphabetically

[Masahiro Yamada]

We are having more and more ignore patterns.  Sort the list
alphabetically.  We will easily catch duplicated patterns if any.

Signed-off-by: Masahiro Yamada <yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>
---

 .gitignore | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f034b8..1cc4b2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,38 +7,38 @@
 # command after changing this file, to see if there are
 # any tracked files which get ignored after the change.
 #
-# Normal rules
+# Normal rules (sorted alphabetically)
 #
 .*
+*.a
+*.bin
+*.bz2
+*.c.[012]*.*
+*.dwo
+*.elf
+*.gcno
+*.gz
+*.i
+*.ko
+*.ll
+*.lst
+*.lz4
+*.lzma
+*.lzo
+*.mod.c
 *.o
 *.o.*
-*.a
+*.order
+*.patch
 *.s
-*.ko
 *.so
 *.so.dbg
-*.mod.c
-*.i
-*.lst
+*.su
 *.symtypes
-*.order
-*.elf
-*.bin
 *.tar
-*.gz
-*.bz2
-*.lzma
 *.xz
-*.lz4
-*.lzo
-*.patch
-*.gcno
-*.ll
-modules.builtin
 Module.symvers
-*.dwo
-*.su
-*.c.[012]*.*
+modules.builtin
 
 #
 # Top-level generic files
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 1/3] .gitignore: sort normal pattern rules alphabetically

[Masahiro Yamada]

We are having more and more ignore patterns.  Sort the list
alphabetically.  We will easily catch duplicated patterns if any.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 .gitignore | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f034b8..1cc4b2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,38 +7,38 @@
 # command after changing this file, to see if there are
 # any tracked files which get ignored after the change.
 #
-# Normal rules
+# Normal rules (sorted alphabetically)
 #
 .*
+*.a
+*.bin
+*.bz2
+*.c.[012]*.*
+*.dwo
+*.elf
+*.gcno
+*.gz
+*.i
+*.ko
+*.ll
+*.lst
+*.lz4
+*.lzma
+*.lzo
+*.mod.c
 *.o
 *.o.*
-*.a
+*.order
+*.patch
 *.s
-*.ko
 *.so
 *.so.dbg
-*.mod.c
-*.i
-*.lst
+*.su
 *.symtypes
-*.order
-*.elf
-*.bin
 *.tar
-*.gz
-*.bz2
-*.lzma
 *.xz
-*.lz4
-*.lzo
-*.patch
-*.gcno
-*.ll
-modules.builtin
 Module.symvers
-*.dwo
-*.su
-*.c.[012]*.*
+modules.builtin
 
 #
 # Top-level generic files
-- 
2.7.4

[PATCH 2/3] .gitignore: move *.dtb and *.dtb.S patterns to the top-level .gitignore

[Masahiro Yamada]

Most of DT files are compiled under arch/*/boot/dts/, but we have some
other directories, like drivers/of/unittest-data/.  We often miss to
add gitignore patterns per directory.  Since there are no source files
that end with .dtb or .dtb.S, we can ignore the patterns globally.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 .gitignore                          | 2 ++
 arch/arc/boot/.gitignore            | 1 -
 arch/arm/boot/.gitignore            | 1 -
 arch/arm64/boot/dts/.gitignore      | 1 -
 arch/metag/boot/.gitignore          | 1 -
 arch/microblaze/boot/.gitignore     | 1 -
 arch/mips/boot/.gitignore           | 1 -
 arch/nios2/boot/.gitignore          | 1 -
 arch/powerpc/boot/.gitignore        | 1 -
 arch/xtensa/boot/.gitignore         | 1 -
 drivers/of/unittest-data/.gitignore | 2 --
 11 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 arch/arm64/boot/dts/.gitignore
 delete mode 100644 drivers/of/unittest-data/.gitignore

diff --git a/.gitignore b/.gitignore
index 1cc4b2e..f6050b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@
 *.bin
 *.bz2
 *.c.[012]*.*
+*.dtb
+*.dtb.S
 *.dwo
 *.elf
 *.gcno
diff --git a/arch/arc/boot/.gitignore b/arch/arc/boot/.gitignore
index 5246969..c4c5fd5 100644
--- a/arch/arc/boot/.gitignore
+++ b/arch/arc/boot/.gitignore
@@ -1,2 +1 @@
-*.dtb*
 uImage
diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore
index 3c79f85..ce1c5ff 100644
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -3,4 +3,3 @@ zImage
 xipImage
 bootpImage
 uImage
-*.dtb
diff --git a/arch/arm64/boot/dts/.gitignore b/arch/arm64/boot/dts/.gitignore
deleted file mode 100644
index b60ed20..0000000
--- a/arch/arm64/boot/dts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.dtb
diff --git a/arch/metag/boot/.gitignore b/arch/metag/boot/.gitignore
index 2d6c0c1..6c662dd 100644
--- a/arch/metag/boot/.gitignore
+++ b/arch/metag/boot/.gitignore
@@ -1,4 +1,3 @@
 vmlinux*
 uImage*
 ramdisk.*
-*.dtb*
diff --git a/arch/microblaze/boot/.gitignore b/arch/microblaze/boot/.gitignore
index bf04591..679502d 100644
--- a/arch/microblaze/boot/.gitignore
+++ b/arch/microblaze/boot/.gitignore
@@ -1,3 +1,2 @@
-*.dtb
 linux.bin*
 simpleImage.*
diff --git a/arch/mips/boot/.gitignore b/arch/mips/boot/.gitignore
index d3962cd..a73d6e2 100644
--- a/arch/mips/boot/.gitignore
+++ b/arch/mips/boot/.gitignore
@@ -5,4 +5,3 @@ zImage
 zImage.tmp
 calc_vmlinuz_load_addr
 uImage
-*.dtb
diff --git a/arch/nios2/boot/.gitignore b/arch/nios2/boot/.gitignore
index 109279c..64386a8 100644
--- a/arch/nios2/boot/.gitignore
+++ b/arch/nios2/boot/.gitignore
@@ -1,2 +1 @@
-*.dtb
 vmImage
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 84774cc..f92d053 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -18,7 +18,6 @@ otheros.bld
 uImage
 cuImage.*
 dtbImage.*
-*.dtb
 treeImage.*
 vmlinux.strip
 zImage
diff --git a/arch/xtensa/boot/.gitignore b/arch/xtensa/boot/.gitignore
index be76559..38177c7 100644
--- a/arch/xtensa/boot/.gitignore
+++ b/arch/xtensa/boot/.gitignore
@@ -1,3 +1,2 @@
 uImage
 zImage.redboot
-*.dtb
diff --git a/drivers/of/unittest-data/.gitignore b/drivers/of/unittest-data/.gitignore
deleted file mode 100644
index 4b3cf8b..0000000
--- a/drivers/of/unittest-data/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-testcases.dtb
-testcases.dtb.S
-- 
2.7.4

[PATCH 3/3] kbuild: clean up *.dtb and *.dtb.S patterns from top-level Makefile

[Masahiro Yamada]

We need to add "clean-files" in Makfiles to clean up DT blobs, but we
often miss to do so.

Since there are no source files that end with .dtb or .dtb.S, so we
can clean-up those files from the top-level Makefile.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 63a4c0e..c577c63 100644
--- a/Makefile
+++ b/Makefile
@@ -1544,7 +1544,7 @@ clean: $(clean-dirs)
 	$(call cmd,rmfiles)
 	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
 		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-		-o -name '*.ko.*' \
+		-o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \
 		-o -name '*.dwo'  \
 		-o -name '*.su'  \
 		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
-- 
2.7.4

Re: [PATCH 3/3] kbuild: clean up *.dtb and *.dtb.S patterns from top-level Makefile

[Rob Herring]

On Mon, Oct 30, 2017 at 10:33 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> We need to add "clean-files" in Makfiles to clean up DT blobs, but we
> often miss to do so.
>
> Since there are no source files that end with .dtb or .dtb.S, so we
> can clean-up those files from the top-level Makefile.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 63a4c0e..c577c63 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1544,7 +1544,7 @@ clean: $(clean-dirs)
>         $(call cmd,rmfiles)
>         @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
>                 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
> -               -o -name '*.ko.*' \
> +               -o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \

With this we can remove all the occurrences in the kernel:

$ git grep 'clean.*dtb'

Otherwise, the series looks good to me. I'm happy to apply it if the
kbuild folks don't.

Rob

Re: [PATCH 3/3] kbuild: clean up *.dtb and *.dtb.S patterns from top-level Makefile

[Masahiro Yamada]

Hi Rob,

2017-10-31 0:53 GMT+09:00 Rob Herring <robh+dt@kernel.org>:
> On Mon, Oct 30, 2017 at 10:33 AM, Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
>> We need to add "clean-files" in Makfiles to clean up DT blobs, but we
>> often miss to do so.
>>
>> Since there are no source files that end with .dtb or .dtb.S, so we
>> can clean-up those files from the top-level Makefile.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>> ---
>>
>>  Makefile | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 63a4c0e..c577c63 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -1544,7 +1544,7 @@ clean: $(clean-dirs)
>>         $(call cmd,rmfiles)
>>         @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
>>                 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
>> -               -o -name '*.ko.*' \
>> +               -o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \
>
> With this we can remove all the occurrences in the kernel:
>
> $ git grep 'clean.*dtb'
>
> Otherwise, the series looks good to me. I'm happy to apply it if the
> kbuild folks don't.
>
> Rob

Yes, please.  Thanks!




-- 
Best Regards
Masahiro Yamada

Re: [PATCH 3/3] kbuild: clean up *.dtb and *.dtb.S patterns from top-level Makefile

[Rob Herring]

On Tue, Oct 31, 2017 at 01:32:15AM +0900, Masahiro Yamada wrote:
> Hi Rob,
> 
> 2017-10-31 0:53 GMT+09:00 Rob Herring <robh+dt@kernel.org>:
> > On Mon, Oct 30, 2017 at 10:33 AM, Masahiro Yamada
> > <yamada.masahiro@socionext.com> wrote:
> >> We need to add "clean-files" in Makfiles to clean up DT blobs, but we
> >> often miss to do so.
> >>
> >> Since there are no source files that end with .dtb or .dtb.S, so we
> >> can clean-up those files from the top-level Makefile.
> >>
> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> >> ---
> >>
> >>  Makefile | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/Makefile b/Makefile
> >> index 63a4c0e..c577c63 100644
> >> --- a/Makefile
> >> +++ b/Makefile
> >> @@ -1544,7 +1544,7 @@ clean: $(clean-dirs)
> >>         $(call cmd,rmfiles)
> >>         @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
> >>                 \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
> >> -               -o -name '*.ko.*' \
> >> +               -o -name '*.ko.*' -o -name '*.dtb' -o -name '*.dtb.S' \
> >
> > With this we can remove all the occurrences in the kernel:
> >
> > $ git grep 'clean.*dtb'
> >
> > Otherwise, the series looks good to me. I'm happy to apply it if the
> > kbuild folks don't.
> >
> > Rob
> 
> Yes, please.  Thanks!

Can you post a follow-up patch removing all the clean-files lines.

Rob