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 --combined Makefile
index f23bed61568fa7c8ffd74132f0e1d6455b543153,5017f3b10bf2da1d0df72d390b5985dd6fb0c10e..de65a173c62ad44cec944e671e5fcdf247f9b31c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -277,9 -277,6 +277,9 @@@ LIBS += arch/powerpc/cpu/mpc8xxx/lib8xx
  endif
  LIBS += drivers/rtc/librtc.o
  LIBS += drivers/serial/libserial.o
 +ifeq ($(CONFIG_GENERIC_LPC_TPM),y)
 +LIBS += drivers/tpm/libtpm.o
 +endif
  LIBS += drivers/twserial/libtws.o
  LIBS += drivers/usb/eth/libusb_eth.o
  LIBS += drivers/usb/gadget/libusb_gadget.o
@@@ -293,9 -290,16 +293,9 @@@ LIBS += lib/libfdt/libfdt.
  LIBS += api/libapi.o
  LIBS += post/libpost.o
  
 -ifeq ($(SOC),am33xx)
 -LIBS += $(CPUDIR)/omap-common/libomap-common.o
 -endif
 -ifeq ($(SOC),omap3)
 -LIBS += $(CPUDIR)/omap-common/libomap-common.o
 -endif
 -ifeq ($(SOC),omap4)
 +ifneq ($(CONFIG_AM335X)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
  LIBS += $(CPUDIR)/omap-common/libomap-common.o
  endif
 -
  ifeq ($(SOC),s5pc1xx)
  LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
  endif
@@@ -420,10 -424,6 +420,10 @@@ $(obj)u-boot.ubl:       $(obj)spl/u-boo
                rm $(obj)u-boot-ubl.bin
                rm $(obj)spl/u-boot-spl-pad.bin
  
 +$(obj)u-boot.sb:       $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin
 +              elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \
 +                      -o $(obj)u-boot.sb
 +
  ifeq ($(CONFIG_SANDBOX),y)
  GEN_UBOOT = \
                cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \
@@@ -486,7 -486,7 +486,7 @@@ mmc_spl:   $(TIMESTAMP_FILE) $(VERSION_FI
  
  $(obj)mmc_spl/u-boot-mmc-spl.bin:     mmc_spl
  
 -$(obj)spl/u-boot-spl.bin:             depend
 +$(obj)spl/u-boot-spl.bin:     $(SUBDIR_TOOLS) depend
                $(MAKE) -C spl all
  
  updater:
@@@ -754,7 -754,7 +754,7 @@@ clean
               $(obj)tools/envcrc                                         \
               $(obj)tools/gdb/{astest,gdbcont,gdbsend}                   \
               $(obj)tools/gen_eth_addr    $(obj)tools/img2srec           \
 -             $(obj)tools/mkimage         $(obj)tools/mpc86x_clk         \
 +             $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk         \
               $(obj)tools/ncb             $(obj)tools/ubsha1
        @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image}        \
               $(obj)board/matrix_vision/*/bootscript.img                 \
@@@ -763,7 -763,6 +763,7 @@@
               $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]          \
               $(obj)arch/blackfin/cpu/init.{lds,elf}
        @rm -f $(obj)include/bmp_logo.h
 +      @rm -f $(obj)include/bmp_logo_data.h
        @rm -f $(obj)lib/asm-offsets.s
        @rm -f $(obj)include/generated/asm-offsets.h
        @rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s
@@@ -780,14 -779,11 +780,14 @@@
                -o -name '*.o'  -o -name '*.a' -o -name '*.exe' \) -print \
                | xargs rm -f
  
 -clobber:      clean
 -      @find $(OBJTREE) -type f \( -name '*.depend*' \
 -              -o -name '*.srec' -o -name '*.bin' -o -name u-boot.img \) \
 -              -print0 \
 -              | xargs -0 rm -f
 +# Removes everything not needed for testing u-boot
 +tidy: clean
 +      @find $(OBJTREE) -type f \( -name '*.depend*' \) -print | xargs rm -f
 +
 +clobber:      tidy
 +      @find $(OBJTREE) -type f \( -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 \
                $(obj)cscope.* $(obj)*.*~
        @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL-y)
@@@ -795,9 -791,9 +795,10 @@@
        @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