diff mbox series

.gitignore: ignore misc include, simple-bin, and tools/generated build artifacts

Message ID 20231013132630.43018-1-inindev@gmail.com
State Accepted
Commit 801c482207c71425666da759b447a1d1d4e62786
Delegated to: Tom Rini
Headers show
Series .gitignore: ignore misc include, simple-bin, and tools/generated build artifacts | expand

Commit Message

John Clark Oct. 13, 2023, 1:26 p.m. UTC
make rock5b-rk3588_defconfig
make
git status

before
~~~~~~~
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	include/autoconf.mk
	include/autoconf.mk.dep
	include/config.h
	mkimage-in-simple-bin-spi.mkimage-rockchip-tpl
	mkimage-in-simple-bin-spi.mkimage-u-boot-spl
	mkimage-in-simple-bin.mkimage-rockchip-tpl
	mkimage-in-simple-bin.mkimage-u-boot-spl
	simple-bin-spi.map
	simple-bin.fit.fit
	simple-bin.fit.itb
	simple-bin.map
	tools/generated/

after
~~~~~~~
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean

Signed-off-by: John Clark <inindev@gmail.com>

---

 .gitignore | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Simon Glass Oct. 13, 2023, 4:57 p.m. UTC | #1
Hi John,

On Fri, 13 Oct 2023 at 06:26, John Clark <inindev@gmail.com> wrote:
>
> make rock5b-rk3588_defconfig
> make
> git status
>
> before
> ~~~~~~~
> On branch master
> Your branch is ahead of 'origin/master' by 1 commit.
>   (use "git push" to publish your local commits)
>
> Untracked files:
>   (use "git add <file>..." to include in what will be committed)
>         include/autoconf.mk
>         include/autoconf.mk.dep
>         include/config.h
>         mkimage-in-simple-bin-spi.mkimage-rockchip-tpl
>         mkimage-in-simple-bin-spi.mkimage-u-boot-spl
>         mkimage-in-simple-bin.mkimage-rockchip-tpl
>         mkimage-in-simple-bin.mkimage-u-boot-spl
>         simple-bin-spi.map
>         simple-bin.fit.fit
>         simple-bin.fit.itb
>         simple-bin.map
>         tools/generated/
>
> after
> ~~~~~~~
> On branch master
> Your branch is ahead of 'origin/master' by 1 commit.
>   (use "git push" to publish your local commits)
>
> nothing to commit, working tree clean
>
> Signed-off-by: John Clark <inindev@gmail.com>
>
> ---
>
>  .gitignore | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

The mkimage and simple-bin things seem board-specific. Once we get
binman to put intermediate-output files in a subdir, we should be able
to drop this.

>
> diff --git a/.gitignore b/.gitignore
> index 84051b7bfd..a1a79e92fe 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -44,8 +44,10 @@ fit-dtb.blob*
>  /MLO*
>  /SPL*
>  /System.map
> -/u-boot*
>  /boards.cfg
> +/mkimage-in-simple-bin*
> +/simple-bin*
> +/u-boot*
>  /*.log
>
>  #
> @@ -59,12 +61,15 @@ fit-dtb.blob*
>  # Generated files
>  #
>  /spl/
> +/tools/generated/
>  /tpl/
>  /defconfig
>
>  #
>  # Generated include files
>  #
> +/include/autoconf.mk*
> +/include/config.h
>  /include/config/
>  /include/generated/
>
> --
> 2.42.0
>

Regards,
Simon
Tom Rini Oct. 24, 2023, 11:16 p.m. UTC | #2
On Fri, Oct 13, 2023 at 01:26:16PM +0000, John Clark wrote:

> make rock5b-rk3588_defconfig
> make
> git status
> 
> before
> ~~~~~~~
> On branch master
> Your branch is ahead of 'origin/master' by 1 commit.
>   (use "git push" to publish your local commits)
> 
> Untracked files:
>   (use "git add <file>..." to include in what will be committed)
> 	include/autoconf.mk
> 	include/autoconf.mk.dep
> 	include/config.h
> 	mkimage-in-simple-bin-spi.mkimage-rockchip-tpl
> 	mkimage-in-simple-bin-spi.mkimage-u-boot-spl
> 	mkimage-in-simple-bin.mkimage-rockchip-tpl
> 	mkimage-in-simple-bin.mkimage-u-boot-spl
> 	simple-bin-spi.map
> 	simple-bin.fit.fit
> 	simple-bin.fit.itb
> 	simple-bin.map
> 	tools/generated/
> 
> after
> ~~~~~~~
> On branch master
> Your branch is ahead of 'origin/master' by 1 commit.
>   (use "git push" to publish your local commits)
> 
> nothing to commit, working tree clean
> 
> Signed-off-by: John Clark <inindev@gmail.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/.gitignore b/.gitignore
index 84051b7bfd..a1a79e92fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,8 +44,10 @@  fit-dtb.blob*
 /MLO*
 /SPL*
 /System.map
-/u-boot*
 /boards.cfg
+/mkimage-in-simple-bin*
+/simple-bin*
+/u-boot*
 /*.log
 
 #
@@ -59,12 +61,15 @@  fit-dtb.blob*
 # Generated files
 #
 /spl/
+/tools/generated/
 /tpl/
 /defconfig
 
 #
 # Generated include files
 #
+/include/autoconf.mk*
+/include/config.h
 /include/config/
 /include/generated/