mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-24 20:54:24 +08:00
e20cc2ca15
Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts: arch/arm/include/asm/arch-am33xx/hardware.h Signed-off-by: Tom Rini <trini@ti.com>
92 lines
927 B
Plaintext
92 lines
927 B
Plaintext
#
|
|
# NOTE! Don't add files that are generated in specific
|
|
# subdirectories here. Add them in the ".gitignore" file
|
|
# in that subdirectory instead.
|
|
#
|
|
# Normal rules
|
|
#
|
|
|
|
*.rej
|
|
*.orig
|
|
*.a
|
|
*.o
|
|
*.su
|
|
*~
|
|
*.swp
|
|
*.patch
|
|
*.bin
|
|
*.cfgtmp
|
|
*.dts.tmp
|
|
|
|
# Build tree
|
|
/build-*
|
|
|
|
#
|
|
# Top-level generic files
|
|
#
|
|
|
|
/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
|
|
|
|
#
|
|
# Generated files
|
|
#
|
|
|
|
*.depend*
|
|
/LOG
|
|
/errlog
|
|
/reloc_off
|
|
|
|
/include/generated/
|
|
asm-offsets.s
|
|
|
|
# stgit generated dirs
|
|
patches-*
|
|
.stgit-edit.txt
|
|
|
|
# quilt's files
|
|
patches
|
|
series
|
|
|
|
# gdb files
|
|
.gdb_history
|
|
|
|
# cscope files
|
|
cscope.*
|
|
|
|
# tags files
|
|
/tags
|
|
/ctags
|
|
/etags
|
|
|
|
# gnu global files
|
|
GPATH
|
|
GRTAGS
|
|
GSYMS
|
|
GTAGS
|
|
|
|
# spl ais files
|
|
/spl/*.ais
|