From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 12 Jun 2014 13:11:30 +0000 (+0800)
Subject: ARM: rockchip: rockchip_defconfig enable DMA_CMA
X-Git-Tag: firefly_0821_release~5129
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f211b40edae3d7ca48558777f327381625473d51;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip: rockchip_defconfig enable DMA_CMA
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index b64d78dac6e6..5087295107d5 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -39,10 +39,6 @@ CONFIG_BLOCK_RKNAND=y
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_PL310_ERRATA_753970=y
 CONFIG_ARM_ERRATA_754322=y
-CONFIG_FIQ_DEBUGGER=y
-CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
-CONFIG_FIQ_DEBUGGER_CONSOLE=y
-CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
 CONFIG_SMP=y
 CONFIG_SCHED_MC=y
 CONFIG_PREEMPT=y
@@ -52,6 +48,7 @@ CONFIG_HIGHMEM=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_CMA=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ARM_APPENDED_DTB=y
@@ -211,7 +208,7 @@ CONFIG_CFG80211_WEXT=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
 CONFIG_DEVTMPFS=y
-CONFIG_CMA=y
+CONFIG_DMA_CMA=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_UID_STAT=y
 CONFIG_SRAM=y
@@ -507,6 +504,10 @@ CONFIG_ION=y
 CONFIG_ION_ROCKCHIP=y
 CONFIG_ION_ROCKCHIP_SNAPSHOT=y
 CONFIG_ION_SNAPSHOT_BUF_SHIFT=15
+CONFIG_FIQ_DEBUGGER=y
+CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
+CONFIG_FIQ_DEBUGGER_CONSOLE=y
+CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
 CONFIG_COMMON_CLK_DEBUG=y
 CONFIG_IIO=y
 CONFIG_ROCKCHIP_ADC=y