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

[oweals/u-boot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9110eda6468fb70c6472b13aa086981a8855ed43..c2afcfbca23e486d5a3337045010d5a6b2d73b67 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,29 +3,32 @@
 # 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
+*.dtbo
+*.dtb.S
+*.elf
+*.exe
+*.gcda
+*.gcno
 *.i
 *.lex.c
 *.lst
+*.mod.c
+*.o
+*.o.*
 *.order
-*.elf
-*.swp
-*.bin
 *.patch
-*.cfgtmp
+*.s
+*.su
+*.swp
 *.tab.[ch]
 
-# host programs on Cygwin
-*.exe
-
 # Build tree
 /build-*
 
@@ -38,6 +41,7 @@ fit-dtb.blob
 /System.map
 /u-boot*
 /boards.cfg
+/*.log
 
 #
 # git files that we don't want to ignore even it they are dot-files
@@ -86,7 +90,3 @@ GTAGS
 *.orig
 *~
 \#*#
-
-# gcc code coverage files
-*.gcda
-*.gcno