diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2014-02-09 23:49:13 -0800 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2014-02-09 23:51:11 -0800 |
| commit | f950aa05f2443494d3952fa3970eed83549d6943 (patch) | |
| tree | 2d4b4d7d25ada8085b885a99dd1f4f44321a07ed /arch/arm/mach-tegra/devices.c | |
| parent | bcb186075677a767c07a89b3bde1f34cc0d788ee (diff) | |
Revert "ARM: tegra: trustzone: Single kernel to work in both secure and non-secure mode."
This reverts commit 7f93a0dddf39f372c064f772f9af6903e91aaacf as
the t132ref builds break with the following errors -
<android>/kernel/drivers/platform/tegra/../../../arch/arm/mach-tegra/reset.c:45: undefined reference to `is_secure_mode'
<android>/kernel/drivers/platform/tegra/../../../arch/arm/mach-tegra/reset.c:57: undefined reference to `is_secure_mode'
<android>/kernel/drivers/platform/tegra/../../../arch/arm/mach-tegra/reset.c:58: undefined reference to `tegra_generic_smc'
Change-Id: I4e44c2ffba4e1c013213e543b67f2d49a928b764
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/365347
Diffstat (limited to 'arch/arm/mach-tegra/devices.c')
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index 182831fafa31..c0b3485b6233 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -2497,7 +2497,8 @@ static struct resource tegra_wdt0_resources[] = { .flags = IORESOURCE_MEM, }, #endif -#if defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER) +#if defined(CONFIG_TEGRA_USE_SECURE_KERNEL) && \ + defined(CONFIG_ARCH_TEGRA_12x_SOC) && defined(CONFIG_FIQ_DEBUGGER) [5] = { .start = TEGRA_WDT4_BASE, .end = TEGRA_WDT4_BASE + TEGRA_WDT4_SIZE - 1, |