From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 11 Sep 2013 07:59:27 +0000 (+0200)
Subject: Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
X-Git-Tag: v2013.10-rc3~5^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=5480ac32171ab0e38c48c9f585fa650c7867f6a1

Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

Conflicts:
	tools/Makefile
---

5480ac32171ab0e38c48c9f585fa650c7867f6a1
diff --cc tools/Makefile
index 0a29147847,b94119202c..c36cde2007
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -70,25 -70,24 +70,26 @@@ EXT_OBJ_FILES-y += lib/md5.
  EXT_OBJ_FILES-y += lib/sha1.o
  
  # Source files located in the tools directory
 -OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
 -OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o
 +NOPED_OBJ_FILES-y += aisimage.o
  NOPED_OBJ_FILES-y += default_image.o
 -NOPED_OBJ_FILES-y += proftool.o
 -OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o
  NOPED_OBJ_FILES-y += fit_image.o
 -OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
 -OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
 -OBJ_FILES-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes.o
 -NOPED_OBJ_FILES-y += aisimage.o
 -NOPED_OBJ_FILES-y += kwbimage.o
 -NOPED_OBJ_FILES-y += pblimage.o
 -NOPED_OBJ_FILES-y += imximage.o
  NOPED_OBJ_FILES-y += image-host.o
 -NOPED_OBJ_FILES-y += omapimage.o
 +NOPED_OBJ_FILES-y += imximage.o
 +NOPED_OBJ_FILES-y += kwbimage.o
  NOPED_OBJ_FILES-y += mkenvimage.o
  NOPED_OBJ_FILES-y += mkimage.o
 +NOPED_OBJ_FILES-y += mxsimage.o
 +NOPED_OBJ_FILES-y += omapimage.o
 +NOPED_OBJ_FILES-y += os_support.o
 +NOPED_OBJ_FILES-y += pblimage.o
 +NOPED_OBJ_FILES-y += proftool.o
 +NOPED_OBJ_FILES-y += ublimage.o
 +OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += envcrc.o
 +OBJ_FILES-$(CONFIG_CMD_LOADS) += img2srec.o
 +OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o
+ OBJ_FILES-$(CONFIG_EXYNOS5250) += mkexynosspl.o
 +OBJ_FILES-$(CONFIG_KIRKWOOD) += kwboot.o
 +OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o
  OBJ_FILES-$(CONFIG_MX23) += mxsboot.o
  OBJ_FILES-$(CONFIG_MX28) += mxsboot.o
  OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o