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

[J-u-boot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5882ff50b1daca0edf01505a3039c91178bb8f8b..8d18d6f49bcbf02c850018aaf2a047e4876ebf0e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,24 +3,30 @@
 # subdirectories here. Add them in the ".gitignore" file
 # in that subdirectory instead.
 #
-# Normal rules
+# Normal rules (sorted alphabetically)
 #
 .*
-*.o
-*.o.*
 *.a
-*.s
-*.su
-*.mod.c
+*.bin
+*.cfgout
+*.dtb
+*.dtb.S
+*.elf
+*.exe
+*.gcda
+*.gcno
 *.i
+*.lex.c
 *.lst
+*.mod.c
+*.o
+*.o.*
 *.order
-*.elf
-*.swp
-*.bin
 *.patch
-*.cfgtmp
-*.dts.tmp
+*.s
+*.su
+*.swp
+*.tab.[ch]
 
 # Build tree
 /build-*
@@ -28,27 +34,12 @@
 #
 # Top-level generic files
 #
+fit-dtb.blob
 /MLO*
-/SPL
+/SPL*
 /System.map
-/u-boot
-/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.sb
+/u-boot*
+/boards.cfg
 
 #
 # git files that we don't want to ignore even it they are dot-files
@@ -59,18 +50,15 @@
 #
 # Generated files
 #
-
-/LOG
-/errlog
-/reloc_off
-
-!/spl/Makefile
-/spl/*
+/spl/
 /tpl/
+/defconfig
 
+#
+# Generated include files
+#
+/include/config/
 /include/generated/
-/include/spl-autoconf.mk
-/include/tpl-autoconf.mk
 
 # stgit generated dirs
 patches-*