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

diff --cc Makefile
index f23bed61568fa7c8ffd74132f0e1d6455b543153,5017f3b10bf2da1d0df72d390b5985dd6fb0c10e..de65a173c62ad44cec944e671e5fcdf247f9b31c
--- 1/Makefile
--- 2/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