diff options
| author | Tom Rini <trini@ti.com> | 2013-04-18 16:16:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-04-18 16:16:01 -0400 |
| commit | 17dcbfb0876385b13739b1b1f2026edc8163b629 (patch) | |
| tree | 5faa5949a895040398e70f6e8ef81dc9da88557e /include/configs/exynos5250-dt.h | |
| parent | 669dfc2ed8d853d6bcdcafa1de6aca22929465e5 (diff) | |
| parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) | |
| download | blackbird-obmc-uboot-17dcbfb0876385b13739b1b1f2026edc8163b629.tar.gz blackbird-obmc-uboot-17dcbfb0876385b13739b1b1f2026edc8163b629.zip | |
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>
Diffstat (limited to 'include/configs/exynos5250-dt.h')
| -rw-r--r-- | include/configs/exynos5250-dt.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 020048a33a..8a82892f4f 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -134,6 +134,11 @@ #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 |
