Merge branch 'staging'

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

diff --git a/.gitignore b/.gitignore
index e13fc96322f72db3945e150e6beb2bd37ee2e7da..e4e95e2d34a26e2b891bdc61067fa45abd3db269 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,32 +13,44 @@
 *~
 *.swp
 *.patch
+*.bin
 
 #
 # Top-level generic files
 #
 
+/MLO
 /System.map
 /u-boot
 /u-boot.hex
+/u-boot.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
 
 #
 # Generated files
 #
 
-*.depend
+*.depend*
 /LOG
 /errlog
 /reloc_off
 
+/include/generated/
+asm-offsets.s
+
 # stgit generated dirs
 patches-*
 .stgit-edit.txt
@@ -54,6 +66,7 @@ series
 cscope.*
 
 # tags files
+/tags
 /ctags
 /etags