summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorNitin Sehgal <nsehgal@nvidia.com>2014-02-06 12:22:45 +0530
committerVarun Wadekar <vwadekar@nvidia.com>2014-02-09 21:54:20 -0800
commit7f93a0dddf39f372c064f772f9af6903e91aaacf (patch)
tree771484fe44d5857a58ca2b20c3dde9820584737e /security
parent76fdf095ea7881e7f62621d6c6baabc4e50e660f (diff)
ARM: tegra: trustzone: Single kernel to work in both secure and non-secure mode.
- Remove CONFIG_TEGRA_USE_SECURE_KERNEL config option - Use DBGDSCR.NS bit to dynamically get secure/non-secure mode - Replace ifdefs with dynamic code. - Keep CONFIG_TRUSTED_LITTLE_KERNEL to enable secure os bug 1411345 Change-Id: I75ddfed7a35fcb30e2772bb43057ae022bcf09b3 Signed-off-by: Nitin Sehgal <nsehgal@nvidia.com> Reviewed-on: http://git-master/r/353155 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'security')
-rw-r--r--security/tf_driver/Kconfig1
-rw-r--r--security/tlk_driver/Kconfig1
2 files changed, 0 insertions, 2 deletions
diff --git a/security/tf_driver/Kconfig b/security/tf_driver/Kconfig
index e212e53913eb..49b34b37bb4f 100644
--- a/security/tf_driver/Kconfig
+++ b/security/tf_driver/Kconfig
@@ -2,7 +2,6 @@ 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 5199be43dd20..b87d6d820a57 100644
--- a/security/tlk_driver/Kconfig
+++ b/security/tlk_driver/Kconfig
@@ -1,6 +1,5 @@
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.