Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

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

diff --git a/.gitignore b/.gitignore
index d91e91b1e652dcac5a91e5f653e7d08e763e1d1c..255d89f8933c9a6fd9bf9456d110bb005bede67c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@
 *.swp
 *.patch
 *.bin
+*.cfgtmp
+*.dts.tmp
 
 # Build tree
 /build-*
@@ -23,11 +25,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
@@ -42,6 +47,7 @@
 /u-boot.ais
 /u-boot.dtb
 /u-boot.sb
+/u-boot.bd
 /u-boot.geany
 
 #
@@ -75,5 +81,11 @@ cscope.*
 /ctags
 /etags
 
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
 # spl ais files
 /spl/*.ais