APF: Updated defconfig to fix issues with 3.12 merge

Merge to 3.12 on Nov 11 removed the CMA configs required for APF
This patch brings back the CMA configs

Signed-off-by: S Mohan <s.mohan@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/configs/xilinx_zynq_apf_defconfig b/arch/arm/configs/xilinx_zynq_apf_defconfig
index 178698a1fa7bd4924bf63966d7af3955510bb9a8..7e2816932b8160989df8163f6b4bf622de0f9367 100644 (file)
--- a/arch/arm/configs/xilinx_zynq_apf_defconfig
+++ b/arch/arm/configs/xilinx_zynq_apf_defconfig
@@ -702,7 +702,18 @@ CONFIG_FW_LOADER_USER_HELPER=y
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
-# CONFIG_DMA_CMA is not set
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=256
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
 
 #
 # Bus devices