[PATCH 1/2] gitignore: add device tree blobs to top-level .gitignore

[PATCH 1/2] gitignore: add device tree blobs to top-level .gitignore

[Ahmad Fatoum]

We have device trees outside of the usual directories, e.g. for
overlays, so move the .gitignore rule to top-level.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 .gitignore                           | 2 ++
 arch/arm/boards/qemu-virt/.gitignore | 3 ---
 arch/arm/dts/.gitignore              | 1 -
 arch/mips/dts/.gitignore             | 1 -
 arch/openrisc/dts/.gitignore         | 1 -
 arch/riscv/dts/.gitignore            | 1 -
 arch/sandbox/dts/.gitignore          | 1 -
 7 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100644 arch/arm/boards/qemu-virt/.gitignore
 delete mode 100644 arch/arm/dts/.gitignore
 delete mode 100644 arch/mips/dts/.gitignore
 delete mode 100644 arch/riscv/dts/.gitignore
 delete mode 100644 arch/sandbox/dts/.gitignore

diff --git a/.gitignore b/.gitignore
index cb87e9314f40..dd36d5083b17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,8 @@
 *.symtypes
 *.tab.[ch]
 Module.symvers
+*.dtb
+*.dtb.*
 
 #
 # Top-level generic files
diff --git a/arch/arm/boards/qemu-virt/.gitignore b/arch/arm/boards/qemu-virt/.gitignore
deleted file mode 100644
index 3e3932a3bfba..000000000000
--- a/arch/arm/boards/qemu-virt/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-*.dtb*
diff --git a/arch/arm/dts/.gitignore b/arch/arm/dts/.gitignore
deleted file mode 100644
index 077903c50a26..000000000000
--- a/arch/arm/dts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*dtb*
diff --git a/arch/mips/dts/.gitignore b/arch/mips/dts/.gitignore
deleted file mode 100644
index 077903c50a26..000000000000
--- a/arch/mips/dts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*dtb*
diff --git a/arch/openrisc/dts/.gitignore b/arch/openrisc/dts/.gitignore
index 077903c50a26..e69de29bb2d1 100644
--- a/arch/openrisc/dts/.gitignore
+++ b/arch/openrisc/dts/.gitignore
@@ -1 +0,0 @@
-*dtb*
diff --git a/arch/riscv/dts/.gitignore b/arch/riscv/dts/.gitignore
deleted file mode 100644
index 077903c50a26..000000000000
--- a/arch/riscv/dts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*dtb*
diff --git a/arch/sandbox/dts/.gitignore b/arch/sandbox/dts/.gitignore
deleted file mode 100644
index 077903c50a26..000000000000
--- a/arch/sandbox/dts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*dtb*
-- 
2.30.2

[PATCH 2/2] defaultenv: ikconfig: add generated directory to .gitignore

[Ahmad Fatoum]

Directory is dynamically generated and config is placed into it when
DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is enabled.

Add it to .gitignore, so it doesn't show up for in-tree builds.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 defaultenv/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/defaultenv/.gitignore b/defaultenv/.gitignore
index e2ef3c4205cb..d14aa0f494b5 100644
--- a/defaultenv/.gitignore
+++ b/defaultenv/.gitignore
@@ -2,3 +2,4 @@
 
 barebox_default_env*
 barebox_zero_env
+defaultenv-2-ikconfig/
-- 
2.30.2

Re: [PATCH 1/2] gitignore: add device tree blobs to top-level .gitignore

[Sascha Hauer]

On Fri, Aug 05, 2022 at 10:53:13AM +0200, Ahmad Fatoum wrote:
> We have device trees outside of the usual directories, e.g. for
> overlays, so move the .gitignore rule to top-level.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  .gitignore                           | 2 ++
>  arch/arm/boards/qemu-virt/.gitignore | 3 ---
>  arch/arm/dts/.gitignore              | 1 -
>  arch/mips/dts/.gitignore             | 1 -
>  arch/openrisc/dts/.gitignore         | 1 -
>  arch/riscv/dts/.gitignore            | 1 -
>  arch/sandbox/dts/.gitignore          | 1 -
>  7 files changed, 2 insertions(+), 8 deletions(-)
>  delete mode 100644 arch/arm/boards/qemu-virt/.gitignore
>  delete mode 100644 arch/arm/dts/.gitignore
>  delete mode 100644 arch/mips/dts/.gitignore
>  delete mode 100644 arch/riscv/dts/.gitignore
>  delete mode 100644 arch/sandbox/dts/.gitignore

Applied, thanks

Sascha

> 
> diff --git a/.gitignore b/.gitignore
> index cb87e9314f40..dd36d5083b17 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -35,6 +35,8 @@
>  *.symtypes
>  *.tab.[ch]
>  Module.symvers
> +*.dtb
> +*.dtb.*
>  
>  #
>  # Top-level generic files
> diff --git a/arch/arm/boards/qemu-virt/.gitignore b/arch/arm/boards/qemu-virt/.gitignore
> deleted file mode 100644
> index 3e3932a3bfba..000000000000
> --- a/arch/arm/boards/qemu-virt/.gitignore
> +++ /dev/null
> @@ -1,3 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0-only
> -
> -*.dtb*
> diff --git a/arch/arm/dts/.gitignore b/arch/arm/dts/.gitignore
> deleted file mode 100644
> index 077903c50a26..000000000000
> --- a/arch/arm/dts/.gitignore
> +++ /dev/null
> @@ -1 +0,0 @@
> -*dtb*
> diff --git a/arch/mips/dts/.gitignore b/arch/mips/dts/.gitignore
> deleted file mode 100644
> index 077903c50a26..000000000000
> --- a/arch/mips/dts/.gitignore
> +++ /dev/null
> @@ -1 +0,0 @@
> -*dtb*
> diff --git a/arch/openrisc/dts/.gitignore b/arch/openrisc/dts/.gitignore
> index 077903c50a26..e69de29bb2d1 100644
> --- a/arch/openrisc/dts/.gitignore
> +++ b/arch/openrisc/dts/.gitignore
> @@ -1 +0,0 @@
> -*dtb*
> diff --git a/arch/riscv/dts/.gitignore b/arch/riscv/dts/.gitignore
> deleted file mode 100644
> index 077903c50a26..000000000000
> --- a/arch/riscv/dts/.gitignore
> +++ /dev/null
> @@ -1 +0,0 @@
> -*dtb*
> diff --git a/arch/sandbox/dts/.gitignore b/arch/sandbox/dts/.gitignore
> deleted file mode 100644
> index 077903c50a26..000000000000
> --- a/arch/sandbox/dts/.gitignore
> +++ /dev/null
> @@ -1 +0,0 @@
> -*dtb*
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |