Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

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

diff --git a/.gitignore b/.gitignore
index 1ac43f2825666d93f2f611e86ab2f735777bf83f..d7d55383acbe6a35fa74c2b4cd669ace3d59ed23 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@
 *.swp
 *.patch
 *.bin
+*.cfgtmp
+*.dts.tmp
 
 # Build tree
 /build-*
@@ -23,11 +25,15 @@
 # Top-level generic files
 #
 
-/MLO
+/MLO*
+/SPL
 /System.map
 /u-boot
+/u-boot.elf
 /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
@@ -38,12 +44,10 @@
 /u-boot.sha1
 /u-boot.dis
 /u-boot.lds
-/u-boot.lst
 /u-boot.ubl
 /u-boot.ais
 /u-boot.dtb
 /u-boot.sb
-/u-boot.geany
 
 #
 # Generated files
@@ -54,7 +58,13 @@
 /errlog
 /reloc_off
 
+!/spl/Makefile
+/spl/*
+/tpl/
+
 /include/generated/
+/include/spl-autoconf.mk
+/include/tpl-autoconf.mk
 asm-offsets.s
 
 # stgit generated dirs
@@ -76,5 +86,8 @@ cscope.*
 /ctags
 /etags
 
-# spl ais files
-/spl/*.ais
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS