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

Quick manual fixup to merge the USB boot related defines and TPM related
defines.

Conflicts:
	include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>

diff --cc include/configs/exynos5250-dt.h
index 020048a33a7c9b4000de3fc7cac0139215e9c544,4514e7a225686667689a24da5aa81cbcd7fdf097..8a82892f4f970665211dd6803a28c983ae2ecb9b
--- 1/include/configs/exynos5250-dt.h
--- 2/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@@ -134,13 -134,11 +134,18 @@@
  #define CONFIG_USB_EHCI_EXYNOS
  #define CONFIG_USB_STORAGE
  
+ /* USB boot mode */
+ #define EXYNOS_COPY_USB_FNPTR_ADDR    0x02020070
+ #define EXYNOS_USB_SECONDARY_BOOT     0xfeed0002
+ #define EXYNOS_IRAM_SECONDARY_BASE    0x02020018
+ 
 +/* TPM */
 +#define CONFIG_TPM
 +#define CONFIG_CMD_TPM
 +#define CONFIG_INFINEON_TPM_I2C
 +#define CONFIG_INFINEON_TPM_I2C_BUS 3
 +#define CONFIG_INFINEON_TPM_I2C_ADDR 0x20
 +
  /* MMC SPL */
  #define CONFIG_SPL
  #define COPY_BL2_FNPTR_ADDR   0x02020030