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

[karo-tx-uboot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d91e91b1e652dcac5a91e5f653e7d08e763e1d1c..5882ff50b1daca0edf01505a3039c91178bb8f8b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,16 +5,22 @@
 #
 # Normal rules
 #
-
-*.rej
-*.orig
-*.a
+.*
 *.o
+*.o.*
+*.a
+*.s
 *.su
-*~
+*.mod.c
+*.i
+*.lst
+*.order
+*.elf
 *.swp
-*.patch
 *.bin
+*.patch
+*.cfgtmp
+*.dts.tmp
 
 # Build tree
 /build-*
@@ -22,12 +28,14 @@
 #
 # Top-level generic files
 #
-
-/MLO
+/MLO*
+/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
@@ -40,21 +48,29 @@
 /u-boot.lds
 /u-boot.ubl
 /u-boot.ais
-/u-boot.dtb
 /u-boot.sb
-/u-boot.geany
+
+#
+# git files that we don't want to ignore even it they are dot-files
+#
+!.gitignore
+!.mailmap
 
 #
 # Generated files
 #
 
-*.depend*
 /LOG
 /errlog
 /reloc_off
 
+!/spl/Makefile
+/spl/*
+/tpl/
+
 /include/generated/
-asm-offsets.s
+/include/spl-autoconf.mk
+/include/tpl-autoconf.mk
 
 # stgit generated dirs
 patches-*
@@ -75,5 +91,12 @@ cscope.*
 /ctags
 /etags
 
-# spl ais files
-/spl/*.ais
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
+*.orig
+*~
+\#*#