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 'master' of git://git.denx.de/u-boot-i2c
[platform/kernel/u-boot.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
e40eb7b
..
a39bd54
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-16,6
+16,7
@@
*.patch
*.bin
*.cfgtmp
*.patch
*.bin
*.cfgtmp
+*.dts.tmp
# Build tree
/build-*
# Build tree
/build-*
@@
-24,11
+25,14
@@
# Top-level generic files
#
# Top-level generic files
#
-/MLO
+/MLO*
+/SPL
/System.map
/u-boot
/u-boot.hex
/u-boot.imx
/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.map
/u-boot.srec
/u-boot.ldr
@@
-43,8
+47,8
@@
/u-boot.ais
/u-boot.dtb
/u-boot.sb
/u-boot.ais
/u-boot.dtb
/u-boot.sb
+/u-boot.bd
/u-boot.geany
/u-boot.geany
-/include/u-boot.lst
#
# Generated files
#
# Generated files
@@
-56,6
+60,8
@@
/reloc_off
/include/generated/
/reloc_off
/include/generated/
+/include/spl-autoconf.mk
+/include/tpl-autoconf.mk
asm-offsets.s
# stgit generated dirs
asm-offsets.s
# stgit generated dirs
@@
-77,5
+83,11
@@
cscope.*
/ctags
/etags
/ctags
/etags
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
+
# spl ais files
/spl/*.ais
# spl ais files
/spl/*.ais