diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-07-30 10:07:00 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-07-30 10:07:00 +0200 |
| commit | 69577ab6bdbb923153b3e8e1b75b9360042d27cd (patch) | |
| tree | 1e9d58072edca40f262327883ac19f20d1d5473c | |
| parent | b12734eed17867ac6ee9fee6afdcf1d632bb345d (diff) | |
| parent | 8b425b3f8e345b07ce7f0005bb0222970bd3b248 (diff) | |
| download | u-boot-imx-69577ab6bdbb923153b3e8e1b75b9360042d27cd.zip u-boot-imx-69577ab6bdbb923153b3e8e1b75b9360042d27cd.tar.gz u-boot-imx-69577ab6bdbb923153b3e8e1b75b9360042d27cd.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
* 'master' of git://git.denx.de/u-boot-mips:
MIPS: fix renaming of inca-swap-bytes to xway-swap-bytes
Signed-off-by: Wolfgang Denk <wd@denx.de>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | tools/.gitignore | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -792,7 +792,7 @@ clobber: tidy @rm -f $(obj)u-boot.dtb @rm -f $(obj)u-boot.sb @rm -f $(obj)u-boot.spr - @rm -f $(obj)tools/inca-swap-bytes + @rm -f $(obj)tools/xway-swap-bytes @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c @rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c @rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm diff --git a/tools/.gitignore b/tools/.gitignore index e4d2c2f..3557a75 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -9,7 +9,7 @@ /ncb /ncp /ubsha1 -/inca-swap-bytes +/xway-swap-bytes /*.exe /easylogo/easylogo /env/crc32.c |