Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / .gitignore

diff --git a/.gitignore b/.gitignore
index d7d55383acbe6a35fa74c2b4cd669ace3d59ed23..8d18d6f49bcbf02c850018aaf2a047e4876ebf0e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,20 +3,30 @@
 # subdirectories here. Add them in the ".gitignore" file
 # in that subdirectory instead.
 #
-# Normal rules
+# Normal rules (sorted alphabetically)
 #
-
-*.rej
-*.orig
+.*
 *.a
+*.bin
+*.cfgout
+*.dtb
+*.dtb.S
+*.elf
+*.exe
+*.gcda
+*.gcno
+*.i
+*.lex.c
+*.lst
+*.mod.c
 *.o
+*.o.*
+*.order
+*.patch
+*.s
 *.su
-*~
 *.swp
-*.patch
-*.bin
-*.cfgtmp
-*.dts.tmp
+*.tab.[ch]
 
 # Build tree
 /build-*
@@ -24,48 +34,31 @@
 #
 # Top-level generic files
 #
-
+fit-dtb.blob
 /MLO*
-/SPL
+/SPL*
 /System.map
-/u-boot
-/u-boot.elf
-/u-boot.hex
-/u-boot.imx
-/u-boot-with-spl.imx
-/u-boot-with-nand-spl.imx
-/u-boot.map
-/u-boot.srec
-/u-boot.ldr
-/u-boot.ldr.hex
-/u-boot.ldr.srec
-/u-boot.img
-/u-boot.kwb
-/u-boot.sha1
-/u-boot.dis
-/u-boot.lds
-/u-boot.ubl
-/u-boot.ais
-/u-boot.dtb
-/u-boot.sb
+/u-boot*
+/boards.cfg
 
 #
-# Generated files
+# git files that we don't want to ignore even it they are dot-files
 #
+!.gitignore
+!.mailmap
 
-*.depend*
-/LOG
-/errlog
-/reloc_off
-
-!/spl/Makefile
-/spl/*
+#
+# Generated files
+#
+/spl/
 /tpl/
+/defconfig
 
+#
+# Generated include files
+#
+/include/config/
 /include/generated/
-/include/spl-autoconf.mk
-/include/tpl-autoconf.mk
-asm-offsets.s
 
 # stgit generated dirs
 patches-*
@@ -91,3 +84,7 @@ GPATH
 GRTAGS
 GSYMS
 GTAGS
+
+*.orig
+*~
+\#*#