From: Wolfgang Denk <wd@denx.de>
Date: Wed, 7 Dec 2011 22:01:26 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
X-Git-Tag: v2011.12-rc1~56
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1086c5d6f8541460f0f10e4a302d8aac27e0e6e0;p=u-boot

Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

* 'master' of git://git.denx.de/u-boot-mpc83xx:
  powerpc/83xx: fix sdram initialization for keymile boards
  powerpc/mpc83xx: cleanup makefile for mpc83xx
---

1086c5d6f8541460f0f10e4a302d8aac27e0e6e0
diff --cc Makefile
index f23bed6156,5017f3b10b..de65a173c6
--- a/Makefile
+++ b/Makefile
@@@ -795,9 -791,9 +795,10 @@@ clobber:	tid
  	@rm -f $(obj)u-boot.imx
  	@rm -f $(obj)u-boot.ubl
  	@rm -f $(obj)u-boot.dtb
 -	@rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
 +	@rm -f $(obj)u-boot.sb
 +	@rm -f $(obj)tools/inca-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
  	@rm -fr $(obj)include/generated
  	@[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f