Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master

[u-boot] / .gitignore

diff --git a/.gitignore b/.gitignore
index e29dce92977aa9e8246325c4e59af3ef78501064..9c53f5c5b54123532d79cb08150facc26d554717 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
 *.orig
 *.a
 *.o
+*~
+*.swp
+*.patch
 
 #
 # Top-level generic files
@@ -24,6 +27,8 @@
 /u-boot.ldr
 /u-boot.ldr.hex
 /u-boot.ldr.srec
+/u-boot-onenand.bin
+/u-boot-flexonenand.bin
 
 #
 # Generated files
@@ -36,6 +41,7 @@
 
 # stgit generated dirs
 patches-*
+.stgit-edit.txt
 
 # quilt's files
 patches
@@ -43,3 +49,12 @@ series
 
 # cscope files
 cscope.*
+
+# tags files
+/ctags
+/etags
+
+# OneNAND IPL files
+/onenand_ipl/onenand-ipl*
+/onenand_ipl/board/*/onenand*
+/onenand_ipl/board/*/*.S