From f950aa05f2443494d3952fa3970eed83549d6943 Mon Sep 17 00:00:00 2001 From: Varun Wadekar Date: Sun, 9 Feb 2014 23:49:13 -0800 Subject: 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 - /kernel/drivers/platform/tegra/../../../arch/arm/mach-tegra/reset.c:45: undefined reference to `is_secure_mode' /kernel/drivers/platform/tegra/../../../arch/arm/mach-tegra/reset.c:57: undefined reference to `is_secure_mode' /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 Reviewed-on: http://git-master/r/365347 --- security/tf_driver/Kconfig | 1 + security/tlk_driver/Kconfig | 1 + 2 files changed, 2 insertions(+) (limited to 'security') 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. -- cgit v1.2.3