Merge git://git.denx.de/u-boot-dm

[people/ms/u-boot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 24019b373750a8f6f48b877a5f63267e3b316827..f6f5dae3d4460f48c45c5d9b4b0e3f0b36e79060 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,9 @@
 *.bin
 *.patch
 *.cfgtmp
-*.dts.tmp
+
+# host programs on Cygwin
+*.exe
 
 # Build tree
 /build-*
@@ -28,28 +30,12 @@
 #
 # Top-level generic files
 #
+fit-dtb.blob
 /MLO*
-/SPL
+/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
-/u-boot.ldr.hex
-/u-boot.ldr.srec
-/u-boot.img
-/u-boot.kwb
-/u-boot.sha1
-/u-boot.dis
-/u-boot.lds
-/u-boot.ubl
-/u-boot.ais
-/u-boot.dtb
-/u-boot.sb
+/u-boot*
+/boards.cfg
 
 #
 # git files that we don't want to ignore even it they are dot-files
@@ -60,18 +46,24 @@
 #
 # Generated files
 #
-
 /LOG
-/errlog
-/reloc_off
-
-!/spl/Makefile
-/spl/*
+/spl/
 /tpl/
+/defconfig
 
+#
+# Generated include files
+#
+/include/config/
 /include/generated/
-/include/spl-autoconf.mk
-/include/tpl-autoconf.mk
+
+# Since "ee95d10 fdt: Build the new python libfdt module", a number of
+# build artifacts and intermediated from the python libfdt module are
+# installed into the /tools directory.
+/tools/_libfdt.so
+/tools/libfdt.py
+/tools/libfdt.pyc
+/tools/libfdt_wrap.c
 
 # stgit generated dirs
 patches-*