From: Marian Balakowicz Date: Wed, 12 Mar 2008 11:23:02 +0000 (+0100) Subject: Merge branch 'master' of git://www.denx.de/git/u-boot into new-image X-Git-Tag: v1.3.3-rc1~141^2^2~9 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7e492d8258182e31c988bbf9917d4a3d41949d56;p=u-boot Merge branch 'master' of git://www.denx.de/git/u-boot into new-image --- 7e492d8258182e31c988bbf9917d4a3d41949d56 diff --cc Makefile index adfef9bbc0,90198f6583..c56518fb9e --- a/Makefile +++ b/Makefile @@@ -2922,15 -2870,11 +2870,13 @@@ clobber: clea -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \ -print0 \ | xargs -0 rm -f - @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS - @rm -fr $(obj)*.*~ + @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \ + $(obj)cscope.* $(obj)*.*~ @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL) - @rm -f $(obj)tools/crc32.c $(obj)tools/environment.c $(obj)tools/env/crc32.c - @rm -f $(obj)tools/sha1.c $(obj)tools/image.c - @rm -f $(obj)tools/fdt.c $(obj)tools/fdt_ro.c $(obj)tools/fdt_rw.c - @rm -f $(obj)tools/fdt_strerror.c $(obj)tools/fdt_wip.c - @rm -f $(obj)tools/libfdt_internal.h - @rm -f $(obj)tools/inca-swap-bytes $(obj)cpu/mpc824x/bedbug_603e.c + @rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,sha1.c,inca-swap-bytes} ++ @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c} ++ @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h} + @rm -f $(obj)cpu/mpc824x/bedbug_603e.c @rm -f $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -lname "*" -print | xargs rm -f @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -lname "*" -print | xargs rm -f