summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
committerStefan Roese <sr@denx.de>2008-08-06 14:05:38 +0200
commitf2302d4430e7f3f48308d6a585320fe96af8afbd (patch)
treeeec529fa883a32b0bd44f65aa46a454dc5c69688 /.gitignore
parent9246f5ecfd353ae297a02ffd5328402acf16c9dd (diff)
downloadblackbird-obmc-uboot-f2302d4430e7f3f48308d6a585320fe96af8afbd.tar.gz
blackbird-obmc-uboot-f2302d4430e7f3f48308d6a585320fe96af8afbd.zip
Fix merge problems
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 89e96f566d..96c1b4a7ae 100644
--- 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
OpenPOWER on IntegriCloud