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

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

diff --git a/.gitignore b/.gitignore
index 1ac43f2825666d93f2f611e86ab2f735777bf83f..e40eb7b6690f9c37eb27c2454770516fa6d01a9c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 *.swp
 *.patch
 *.bin
+*.cfgtmp
 
 # Build tree
 /build-*
@@ -38,12 +39,12 @@
 /u-boot.sha1
 /u-boot.dis
 /u-boot.lds
-/u-boot.lst
 /u-boot.ubl
 /u-boot.ais
 /u-boot.dtb
 /u-boot.sb
 /u-boot.geany
+/include/u-boot.lst
 
 #
 # Generated files