fdt_support: add missing #ifdef after merge

[karo-tx-uboot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c79d5770c04623fa3430273dff92ee9c49bb866a..2cba50167ed64d20ba0da20a802dd46a41f33a60 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,61 +5,55 @@
 #
 # Normal rules
 #
-
-*.rej
-*.orig
-*.a
+.*
 *.o
+*.o.*
+*.a
+*.s
 *.su
-*~
+*.mod.c
+*.i
+*.lst
+*.order
+*.elf
 *.swp
-*.patch
 *.bin
+*.patch
 *.cfgtmp
 
+# host programs on Cygwin
+*.exe
+
 # Build tree
 /build-*
 
 #
 # Top-level generic files
 #
-
-/MLO
+/MLO*
 /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.bd
-/u-boot.geany
+/u-boot*
+/boards.cfg
 
 #
-# Generated files
+# git files that we don't want to ignore even it they are dot-files
 #
+!.gitignore
+!.mailmap
 
-*.depend*
+#
+# Generated files
+#
 /LOG
-/errlog
-/reloc_off
+/spl/
+/tpl/
 
+#
+# Generated include files
+#
+/include/config/
 /include/generated/
-asm-offsets.s
 
 # stgit generated dirs
 patches-*
@@ -68,6 +62,7 @@ patches-*
 # quilt's files
 patches
 series
+.pc
 
 # gdb files
 .gdb_history
@@ -80,5 +75,12 @@ cscope.*
 /ctags
 /etags
 
-# spl ais files
-/spl/*.ais
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
+*.orig
+*~
+\#*#