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

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

diff --git a/.gitignore b/.gitignore
index e13fc96322f72db3945e150e6beb2bd37ee2e7da..255d89f8933c9a6fd9bf9456d110bb005bede67c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,35 +10,58 @@
 *.orig
 *.a
 *.o
+*.su
 *~
 *.swp
 *.patch
+*.bin
+*.cfgtmp
+*.dts.tmp
+
+# 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.bin
 /u-boot.srec
 /u-boot.ldr
 /u-boot.ldr.hex
 /u-boot.ldr.srec
-/u-boot-onenand.bin
-/u-boot-flexonenand.bin
+/u-boot.img
+/u-boot.kwb
+/u-boot.sha1
+/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/
+asm-offsets.s
+
 # stgit generated dirs
 patches-*
 .stgit-edit.txt
@@ -54,10 +77,15 @@ series
 cscope.*
 
 # tags files
+/tags
 /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