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

[people/ms/u-boot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0f32fd8954337645d4cb0373f1435f3b0e48034e..3b14c256e1971d23df29348ca161cccd84130592 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,16 +15,24 @@
 *.swp
 *.patch
 *.bin
+*.cfgtmp
+*.dts.tmp
+
+# Build tree
+/build-*
 
 #
 # Top-level generic files
 #
 
-/MLO
+/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.srec
 /u-boot.ldr
@@ -49,7 +57,13 @@
 /errlog
 /reloc_off
 
+/spl/
+!/spl/Makefile
+/tpl/
+
 /include/generated/
+/include/spl-autoconf.mk
+/include/tpl-autoconf.mk
 asm-offsets.s
 
 # stgit generated dirs
@@ -71,7 +85,8 @@ cscope.*
 /ctags
 /etags
 
-# OneNAND IPL files
-/onenand_ipl/onenand-ipl*
-/onenand_ipl/board/*/onenand*
-/onenand_ipl/board/*/*.S
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS