Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / .gitignore

diff --git a/.gitignore b/.gitignore
index f6f5dae3d4460f48c45c5d9b4b0e3f0b36e79060..8d18d6f49bcbf02c850018aaf2a047e4876ebf0e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,26 +3,30 @@
 # subdirectories here. Add them in the ".gitignore" file
 # in that subdirectory instead.
 #
-# Normal rules
+# Normal rules (sorted alphabetically)
 #
 .*
-*.o
-*.o.*
 *.a
-*.s
-*.su
-*.mod.c
+*.bin
+*.cfgout
+*.dtb
+*.dtb.S
+*.elf
+*.exe
+*.gcda
+*.gcno
 *.i
+*.lex.c
 *.lst
+*.mod.c
+*.o
+*.o.*
 *.order
-*.elf
-*.swp
-*.bin
 *.patch
-*.cfgtmp
-
-# host programs on Cygwin
-*.exe
+*.s
+*.su
+*.swp
+*.tab.[ch]
 
 # Build tree
 /build-*
@@ -46,7 +50,6 @@ fit-dtb.blob
 #
 # Generated files
 #
-/LOG
 /spl/
 /tpl/
 /defconfig
@@ -57,14 +60,6 @@ fit-dtb.blob
 /include/config/
 /include/generated/
 
-# 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-*
 .stgit-edit.txt