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

[platform/kernel/u-boot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e13fc96..8ec3d06 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -21,12 +21,14 @@
 /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.lds
 /u-boot-onenand.bin
 /u-boot-flexonenand.bin
 
@@ -39,6 +41,9 @@
 /errlog
 /reloc_off
 
+/include/generated/
+/lib/asm-offsets.s
+
 # stgit generated dirs
 patches-*
 .stgit-edit.txt
@@ -54,6 +59,7 @@ series
 cscope.*
 
 # tags files
+/tags
 /ctags
 /etags