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

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

diff --git a/.gitignore b/.gitignore
index b78e2ac681c5a8df5a6691e49eef4d14a9d7cb00..e40eb7b6690f9c37eb27c2454770516fa6d01a9c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 *.swp
 *.patch
 *.bin
+*.cfgtmp
 
 # Build tree
 /build-*
@@ -43,6 +44,7 @@
 /u-boot.dtb
 /u-boot.sb
 /u-boot.geany
+/include/u-boot.lst
 
 #
 # Generated files
@@ -75,7 +77,5 @@ cscope.*
 /ctags
 /etags
 
-# OneNAND IPL files
-/onenand_ipl/onenand-ipl*
-/onenand_ipl/board/*/onenand*
-/onenand_ipl/board/*/*.S
+# spl ais files
+/spl/*.ais