Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'

[u-boot] / .gitignore

diff --git a/.gitignore b/.gitignore
index ffe0cc71076db15d3915ad9f58517d64e4a7cac5..0ace33bd616e1bb70b0df30370eb7b32ad09931d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,9 @@
 *.bin
 *.patch
 *.cfgtmp
-*.dts.tmp
+
+# host programs on Cygwin
+*.exe
 
 # Build tree
 /build-*
@@ -42,15 +44,14 @@
 #
 # Generated files
 #
-
 /LOG
-/errlog
-/reloc_off
-
-!/spl/Makefile
-/spl/*
+/spl/
 /tpl/
 
+#
+# Generated include files
+#
+/include/config/
 /include/generated/
 /include/spl-autoconf.mk
 /include/tpl-autoconf.mk