From: Tom Rini <trini@ti.com>
Date: Thu, 18 Apr 2013 20:16:01 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm into HEAD
X-Git-Tag: v2013.04~3
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=17dcbfb0876385b13739b1b1f2026edc8163b629

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>
---

17dcbfb0876385b13739b1b1f2026edc8163b629
diff --cc include/configs/exynos5250-dt.h
index 020048a33a,4514e7a225..8a82892f4f
--- a/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