diff --git a/.gitignore b/.gitignore
index 96c1b4a7ae63a2478f54ab90b35c4841e19f7c37..9c53f5c5b54123532d79cb08150facc26d554717 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.a
 *.o
 *~
+*.swp
 *.patch
 
 #
@@ -49,6 +50,10 @@ series
 # cscope files
 cscope.*
 
+# tags files
+/ctags
+/etags
+
 # OneNAND IPL files
 /onenand_ipl/onenand-ipl*
 /onenand_ipl/board/*/onenand*