Fix merge problems

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

diff --git a/.gitignore b/.gitignore
index 89e96f566d9a4e192e412a9102548a091eb50301..96c1b4a7ae63a2478f54ab90b35c4841e19f7c37 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,8 @@
 /u-boot.ldr
 /u-boot.ldr.hex
 /u-boot.ldr.srec
+/u-boot-onenand.bin
+/u-boot-flexonenand.bin
 
 #
 # Generated files
@@ -46,3 +48,8 @@ series
 
 # cscope files
 cscope.*
+
+# OneNAND IPL files
+/onenand_ipl/onenand-ipl*
+/onenand_ipl/board/*/onenand*
+/onenand_ipl/board/*/*.S