commit | 3762825c0f00a3d524f32092ca16537b4d0dca87 | [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 | ce5dcbfd9ab4794eb68d7a3f983054d45d06d46d [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