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

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

diff --git a/.gitignore b/.gitignore
index 255d89f8933c9a6fd9bf9456d110bb005bede67c..3b14c256e1971d23df29348ca161cccd84130592 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -47,8 +47,6 @@
 /u-boot.ais
 /u-boot.dtb
 /u-boot.sb
-/u-boot.bd
-/u-boot.geany
 
 #
 # Generated files
@@ -59,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
@@ -86,6 +90,3 @@ GPATH
 GRTAGS
 GSYMS
 GTAGS
-
-# spl ais files
-/spl/*.ais