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

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

diff --git a/.gitignore b/.gitignore
index a163728832eb0fc7b01ece5d81c6239f3b824671..ed212032b4dd7ef53eac57f5b208fc6153c73fbe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 *.swp
 *.patch
 *.bin
+*.cfgtmp
 
 # Build tree
 /build-*
@@ -24,10 +25,13 @@
 #
 
 /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
@@ -43,7 +47,6 @@
 /u-boot.dtb
 /u-boot.sb
 /u-boot.geany
-/include/u-boot.lst
 
 #
 # Generated files