aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2014-04-21 11:47:48 +0800
committerMark Brown <broonie@linaro.org>2014-05-05 18:32:18 -0700
commit9277e0edb229b0ed6b0a19cac6c0d4cfedc2cc16 (patch)
treea25180356dabe29806acfdc9182627d14d977697
parent0fe751fba7fe6ca36769c43c9ef183a4e1a1b29b (diff)
downloadlinux-linaro-stable-9277e0edb229b0ed6b0a19cac6c0d4cfedc2cc16.tar.gz
arm64: enable CMA kernel config options
Enable CMA kernel config options for LSK Signed-off-by: Alex Shi <alex.shi@linaro.org> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--arch/arm64/configs/defconfig1
-rw-r--r--linaro/configs/vexpress64.conf2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 8d9696adb440..778a251ab6d5 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -86,3 +86,4 @@ CONFIG_DEBUG_KERNEL=y
CONFIG_DEBUG_INFO=y
# CONFIG_FTRACE is not set
CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_DMA_CMA=y
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf
index eecc6d564ad6..118cfd08d3ef 100644
--- a/linaro/configs/vexpress64.conf
+++ b/linaro/configs/vexpress64.conf
@@ -30,3 +30,5 @@ CONFIG_VIRTIO_BLK=y
CONFIG_VIRTIO_MMIO=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_CMA=y
+CONFIG_DMA_CMA=y