summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/headsmp.S
diff options
context:
space:
mode:
authorVarun Wadekar <vwadekar@nvidia.com>2013-04-08 15:17:29 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:08:07 -0700
commitce783e1f977db7459eb9e333aa83effbb5805951 (patch)
treed09098ad97c915fdd4f24e8850d748ce41ad6581 /arch/arm/mach-tegra/headsmp.S
parent386a98a1b2aaafe24c08667e236fe87893576f30 (diff)
ARM: Tegra: issue smc to wakeup secure world only for TF's OS
Change-Id: I7a0031e70d3be1f1950633888aa3ad24a5ddcced Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/217283 GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'arch/arm/mach-tegra/headsmp.S')
-rw-r--r--arch/arm/mach-tegra/headsmp.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S
index 06091dd214f2..473cc1f6fcc1 100644
--- a/arch/arm/mach-tegra/headsmp.S
+++ b/arch/arm/mach-tegra/headsmp.S
@@ -115,7 +115,7 @@ ENTRY(tegra_resume)
str r1, [r0]
#endif /* CONFIG_HAVE_ARM_SCU */
-#ifdef CONFIG_TEGRA_USE_SECURE_KERNEL
+#ifdef CONFIG_TRUSTED_FOUNDATIONS
#ifndef CONFIG_ARCH_TEGRA_11x_SOC
mov32 r1, TEGRA_TMRUS_BASE
ldr r0, [r1]
@@ -131,7 +131,7 @@ ENTRY(tegra_resume)
adr r1, tegra_resume_smc_exit_time
str r0, [r1]
#endif /* !CONFIG_ARCH_TEGRA_11x_SOC */
-#endif /* CONFIG_TEGRA_USE_SECURE_KERNEL */
+#endif /* CONFIG_TRUSTED_FOUNDATIONS */
#ifdef CONFIG_CACHE_L2X0
#if !defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \