diff options
author | Nitin Sehgal <nsehgal@nvidia.com> | 2014-02-06 12:22:45 +0530 |
---|---|---|
committer | Varun Wadekar <vwadekar@nvidia.com> | 2014-02-09 21:54:20 -0800 |
commit | 7f93a0dddf39f372c064f772f9af6903e91aaacf (patch) | |
tree | 771484fe44d5857a58ca2b20c3dde9820584737e /arch/arm/mach-tegra/Makefile | |
parent | 76fdf095ea7881e7f62621d6c6baabc4e50e660f (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 'arch/arm/mach-tegra/Makefile')
-rw-r--r-- | arch/arm/mach-tegra/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index f9362bcbbbf3..27b7754bfb71 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -169,7 +169,7 @@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-paz00.o obj-y += board-common.o obj-$(CONFIG_TEGRA_WAKEUP_MONITOR) += tegra_wakeup_monitor.o -obj-$(CONFIG_TEGRA_USE_SECURE_KERNEL) += tegra_tzram.o +obj-$(CONFIG_TRUSTED_LITTLE_KERNEL) += tegra_tzram.o obj-${CONFIG_MACH_BONAIRE} += board-bonaire.o obj-${CONFIG_MACH_BONAIRE} += board-bonaire-panel.o |