Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

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

diff --git a/.gitignore b/.gitignore
index 0f32fd8954337645d4cb0373f1435f3b0e48034e..ed212032b4dd7ef53eac57f5b208fc6153c73fbe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,16 +15,23 @@
 *.swp
 *.patch
 *.bin
+*.cfgtmp
+
+# Build tree
+/build-*
 
 #
 # Top-level generic files
 #
 
 /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
@@ -39,6 +46,7 @@
 /u-boot.ais
 /u-boot.dtb
 /u-boot.sb
+/u-boot.geany
 
 #
 # Generated files
@@ -71,7 +79,5 @@ cscope.*
 /ctags
 /etags
 
-# OneNAND IPL files
-/onenand_ipl/onenand-ipl*
-/onenand_ipl/board/*/onenand*
-/onenand_ipl/board/*/*.S
+# spl ais files
+/spl/*.ais