summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorVarun Wadekar <vwadekar@nvidia.com>2014-02-09 23:49:13 -0800
committerVarun Wadekar <vwadekar@nvidia.com>2014-02-09 23:51:11 -0800
commitf950aa05f2443494d3952fa3970eed83549d6943 (patch)
tree2d4b4d7d25ada8085b885a99dd1f4f44321a07ed /security
parentbcb186075677a767c07a89b3bde1f34cc0d788ee (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 'security')
-rw-r--r--security/tf_driver/Kconfig1
-rw-r--r--security/tlk_driver/Kconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/security/tf_driver/Kconfig b/security/tf_driver/Kconfig
index 49b34b37bb4f..e212e53913eb 100644
--- a/security/tf_driver/Kconfig
+++ b/security/tf_driver/Kconfig
@@ -2,6 +2,7 @@ config TRUSTED_FOUNDATIONS
bool "Enable TF Driver"
default n
select CRYPTO_SHA1
+ select TEGRA_USE_SECURE_KERNEL
help
This option adds kernel support for communication with the Trusted Foundations.
Default options is n
diff --git a/security/tlk_driver/Kconfig b/security/tlk_driver/Kconfig
index b87d6d820a57..5199be43dd20 100644
--- a/security/tlk_driver/Kconfig
+++ b/security/tlk_driver/Kconfig
@@ -1,5 +1,6 @@
config TRUSTED_LITTLE_KERNEL
bool "Enable Open Trusted Execution driver"
+ select TEGRA_USE_SECURE_KERNEL
help
This option adds kernel support for communication with the
Trusted LK secure OS monitor/runtime support.