diff options
| author | Wolfgang Denk | 2008-02-14 17:06:18 -0600 |
|---|---|---|
| committer | Wolfgang Denk | 2008-02-14 17:06:18 -0600 |
| commit | 6f99eec3dc2285abfb93631003f7e5cadf2eab0f (patch) | |
| tree | 1eaaa31eb768d8bfa68e9ff41eef53d37b64f21c /.gitignore | |
| parent | f6921e3dc331293c873ec4d109fd5517a42a90b3 (diff) | |
| parent | 30942b18b66f35f2ceedab39af10e9eccaa943cc (diff) | |
| download | u-boot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.tar.gz u-boot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.tar.xz u-boot-6f99eec3dc2285abfb93631003f7e5cadf2eab0f.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Conflicts:
Makefile
doc/README.standalone
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 37f2c1dcd9..7c56594381 100644 --- a/.gitignore +++ b/.gitignore | |||
| @@ -18,9 +18,13 @@ | |||
| 18 | 18 | ||
| 19 | /System.map | 19 | /System.map |
| 20 | /u-boot | 20 | /u-boot |
| 21 | /u-boot.hex | ||
| 21 | /u-boot.map | 22 | /u-boot.map |
| 22 | /u-boot.bin | 23 | /u-boot.bin |
| 23 | /u-boot.srec | 24 | /u-boot.srec |
| 25 | /u-boot.ldr | ||
| 26 | /u-boot.ldr.hex | ||
| 27 | /u-boot.ldr.srec | ||
| 24 | 28 | ||
| 25 | # | 29 | # |
| 26 | # Generated files | 30 | # Generated files |