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

diff --combined Makefile
index 8aa80399afa0e084cb98e42eb3e615651881e013,5de84b6474ef406a6925b54f907bb907e894b4c9..d8637b69726b63387f0367a8d5a325ab38c93bcd
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -398,7 -398,6 +398,7 @@@ ALL-y += $(obj)u-boot.srec $(obj)u-boot
  ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin
  ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin
  ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin
 +ALL-$(CONFIG_SPL_FRAMEWORK) += $(obj)u-boot.img
  ALL-$(CONFIG_TPL) += $(obj)tpl/u-boot-tpl.bin
  ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin
  ifneq ($(CONFIG_SPL_TARGET),)
@@@ -867,7 -866,7 +867,7 @@@ clean
               $(obj)tools/gdb/{astest,gdbcont,gdbsend}                   \
               $(obj)tools/gen_eth_addr    $(obj)tools/img2srec           \
               $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk         \
-              $(obj)tools/mk{smdk5250,}spl                               \
+              $(obj)tools/mk{$(BOARD),}spl                               \
               $(obj)tools/mxsboot                                        \
               $(obj)tools/ncb             $(obj)tools/ubsha1             \
               $(obj)tools/kernel-doc/docproc                             \