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

[platform/kernel/u-boot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index cba5eac..0ace33b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,9 @@
 *.bin
 *.patch
 *.cfgtmp
-*.dts.tmp
+
+# host programs on Cygwin
+*.exe
 
 # Build tree
 /build-*
@@ -42,13 +44,8 @@
 #
 # Generated files
 #
-
 /LOG
-/errlog
-/reloc_off
-
-!/spl/Makefile
-/spl/*
+/spl/
 /tpl/
 
 #