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

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

diff --git a/.gitignore b/.gitignore
index 289ffab85a54fbecf01727db8c5e2ac994881ee0..771b860ee8ef86f50e66b9e16c9c9ede2a2bcba2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,20 +10,28 @@
 *.orig
 *.a
 *.o
+*.su
 *~
 *.swp
 *.patch
 *.bin
+*.cfgtmp
+
+# Build tree
+/build-*
 
 #
 # Top-level generic files
 #
 
 /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
@@ -35,19 +43,23 @@
 /u-boot.dis
 /u-boot.lds
 /u-boot.ubl
+/u-boot.ais
+/u-boot.dtb
+/u-boot.sb
+/u-boot.bd
+/u-boot.geany
 
 #
 # Generated files
 #
 
-*.depend
+*.depend*
 /LOG
 /errlog
 /reloc_off
 
 /include/generated/
-/lib/asm-offsets.s
-/arch/*/cpu/asm-offsets.s
+asm-offsets.s
 
 # stgit generated dirs
 patches-*
@@ -68,7 +80,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