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 /arch/arm/include/asm/arch-tegra114/tegra.h | |
parent | 669dfc2ed8d853d6bcdcafa1de6aca22929465e5 (diff) | |
parent | f2e8a87305a55652488af140adcf65b1e688f287 (diff) |
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 'arch/arm/include/asm/arch-tegra114/tegra.h')
-rw-r--r-- | arch/arm/include/asm/arch-tegra114/tegra.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-tegra114/tegra.h b/arch/arm/include/asm/arch-tegra114/tegra.h index a3d12d6cd02..5d426b524a1 100644 --- a/arch/arm/include/asm/arch-tegra114/tegra.h +++ b/arch/arm/include/asm/arch-tegra114/tegra.h @@ -18,6 +18,7 @@ #define _TEGRA114_H_ #define NV_PA_SDRAM_BASE 0x80000000 /* 0x80000000 for real T114 */ +#define NV_PA_TSC_BASE 0x700F0000 /* System Counter TSC regs */ #include <asm/arch-tegra/tegra.h> |