summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi Doyu <hdoyu@nvidia.com>2013-06-07 14:08:20 +0300
committerHarshada Kale <hkale@nvidia.com>2013-06-10 03:55:17 -0700
commit247c34157a220978c25fcf95982d214438f0a21b (patch)
treeba0e07e12058c4c85e3e606f0e2f146b724425ef
parentdbd73a44ba87b987d6adc9700a4f4d01de2cbd4d (diff)
ARM: tegra{3,11}: config: Enable CMA & IOMMU
Enabled CMA & IOMMU Change-Id: I54550f6bbcf67b1ff61126a75ec1e9e9014cc125 Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> Reviewed-on: http://git-master/r/236725 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
-rw-r--r--arch/arm/configs/tegra11_defconfig2
-rw-r--r--arch/arm/configs/tegra3_defconfig2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra11_defconfig b/arch/arm/configs/tegra11_defconfig
index e3964561946f..4dbcade6e26a 100644
--- a/arch/arm/configs/tegra11_defconfig
+++ b/arch/arm/configs/tegra11_defconfig
@@ -508,3 +508,5 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_TWOFISH=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_DEV_TEGRA_SE=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_CMA=y
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig
index 5307acd26c44..f6054bc1fa5a 100644
--- a/arch/arm/configs/tegra3_defconfig
+++ b/arch/arm/configs/tegra3_defconfig
@@ -465,3 +465,5 @@ CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_TWOFISH=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
CONFIG_CRYPTO_DEV_TEGRA_SE=y
+CONFIG_TEGRA_IOMMU_SMMU=y
+CONFIG_CMA=y