projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'u-boot/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
255d89f
..
5882ff5
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-5,16
+5,20
@@
#
# Normal rules
#
#
# Normal rules
#
-
-*.rej
-*.orig
-*.a
+.*
*.o
*.o
+*.o.*
+*.a
+*.s
*.su
*.su
-*~
+*.mod.c
+*.i
+*.lst
+*.order
+*.elf
*.swp
*.swp
-*.patch
*.bin
*.bin
+*.patch
*.cfgtmp
*.dts.tmp
*.cfgtmp
*.dts.tmp
@@
-24,7
+28,6
@@
#
# Top-level generic files
#
#
# Top-level generic files
#
-
/MLO*
/SPL
/System.map
/MLO*
/SPL
/System.map
@@
-45,22
+48,29
@@
/u-boot.lds
/u-boot.ubl
/u-boot.ais
/u-boot.lds
/u-boot.ubl
/u-boot.ais
-/u-boot.dtb
/u-boot.sb
/u-boot.sb
-/u-boot.bd
-/u-boot.geany
+
+#
+# git files that we don't want to ignore even it they are dot-files
+#
+!.gitignore
+!.mailmap
#
# Generated files
#
#
# Generated files
#
-*.depend*
/LOG
/errlog
/reloc_off
/LOG
/errlog
/reloc_off
+!/spl/Makefile
+/spl/*
+/tpl/
+
/include/generated/
/include/generated/
-asm-offsets.s
+/include/spl-autoconf.mk
+/include/tpl-autoconf.mk
# stgit generated dirs
patches-*
# stgit generated dirs
patches-*
@@
-87,5
+97,6
@@
GRTAGS
GSYMS
GTAGS
GSYMS
GTAGS
-# spl ais files
-/spl/*.ais
+*.orig
+*~
+\#*#