| commit | f2302d4430e7f3f48308d6a585320fe96af8afbd | [log] [tgz] |
|---|---|---|
| author | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
| committer | Stefan Roese <sr@denx.de> | Wed Aug 06 14:05:38 2008 +0200 |
| tree | eec529fa883a32b0bd44f65aa46a454dc5c69688 | |
| parent | 9246f5ecfd353ae297a02ffd5328402acf16c9dd [diff] [blame] |
Fix merge problems Signed-off-by: Stefan Roese <sr@denx.de>
diff --git a/.gitignore b/.gitignore index 89e96f5..96c1b4a 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 @@ # cscope files cscope.* + +# OneNAND IPL files +/onenand_ipl/onenand-ipl* +/onenand_ipl/board/*/onenand* +/onenand_ipl/board/*/*.S