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

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

diff --git a/.gitignore b/.gitignore
index 0f32fd8954337645d4cb0373f1435f3b0e48034e..255d89f8933c9a6fd9bf9456d110bb005bede67c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,16 +15,24 @@
 *.swp
 *.patch
 *.bin
+*.cfgtmp
+*.dts.tmp
+
+# Build tree
+/build-*
 
 #
 # 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
@@ -39,6 +47,8 @@
 /u-boot.ais
 /u-boot.dtb
 /u-boot.sb
+/u-boot.bd
+/u-boot.geany
 
 #
 # Generated files
@@ -71,7 +81,11 @@ cscope.*
 /ctags
 /etags
 
-# OneNAND IPL files
-/onenand_ipl/onenand-ipl*
-/onenand_ipl/board/*/onenand*
-/onenand_ipl/board/*/*.S
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
+# spl ais files
+/spl/*.ais