diff options
author | Shawn Guo <shawn.guo@freescale.com> | 2014-04-10 02:53:34 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-05-12 10:58:46 -0400 |
commit | 4fcad49245ed7f62f2ad2a3bd238eaac227d3f56 (patch) | |
tree | 4a58bf4d1a2ec9d63416a4a6c096818f468f4102 | |
parent | 656be7cfe5c14d63c9c80c7779959d9bb9f0f85f (diff) |
ARM: imx_v6_v7_defconfig: enable cpufreq and CMA support
- Enable imx6 cpufreq support with ondemand governor
- Enable CMA support so that device like 1080p HDMI can work
- Run savedefconfig
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
-rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 0316926f44cd..6713a406b521 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig | |||
@@ -46,7 +46,11 @@ CONFIG_VMSPLIT_2G=y | |||
46 | CONFIG_PREEMPT_VOLUNTARY=y | 46 | CONFIG_PREEMPT_VOLUNTARY=y |
47 | CONFIG_AEABI=y | 47 | CONFIG_AEABI=y |
48 | CONFIG_HIGHMEM=y | 48 | CONFIG_HIGHMEM=y |
49 | CONFIG_CMA=y | ||
49 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" | 50 | CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" |
51 | CONFIG_CPU_FREQ=y | ||
52 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y | ||
53 | CONFIG_ARM_IMX6Q_CPUFREQ=y | ||
50 | CONFIG_VFP=y | 54 | CONFIG_VFP=y |
51 | CONFIG_NEON=y | 55 | CONFIG_NEON=y |
52 | CONFIG_BINFMT_MISC=m | 56 | CONFIG_BINFMT_MISC=m |
@@ -72,6 +76,7 @@ CONFIG_RFKILL_INPUT=y | |||
72 | CONFIG_DEVTMPFS=y | 76 | CONFIG_DEVTMPFS=y |
73 | CONFIG_DEVTMPFS_MOUNT=y | 77 | CONFIG_DEVTMPFS_MOUNT=y |
74 | # CONFIG_STANDALONE is not set | 78 | # CONFIG_STANDALONE is not set |
79 | CONFIG_DMA_CMA=y | ||
75 | CONFIG_IMX_WEIM=y | 80 | CONFIG_IMX_WEIM=y |
76 | CONFIG_CONNECTOR=y | 81 | CONFIG_CONNECTOR=y |
77 | CONFIG_MTD=y | 82 | CONFIG_MTD=y |
@@ -247,7 +252,6 @@ CONFIG_DRM_IMX_LDB=y | |||
247 | CONFIG_DRM_IMX_IPUV3_CORE=y | 252 | CONFIG_DRM_IMX_IPUV3_CORE=y |
248 | CONFIG_DRM_IMX_IPUV3=y | 253 | CONFIG_DRM_IMX_IPUV3=y |
249 | CONFIG_DRM_IMX_HDMI=y | 254 | CONFIG_DRM_IMX_HDMI=y |
250 | CONFIG_COMMON_CLK_DEBUG=y | ||
251 | # CONFIG_IOMMU_SUPPORT is not set | 255 | # CONFIG_IOMMU_SUPPORT is not set |
252 | CONFIG_PWM=y | 256 | CONFIG_PWM=y |
253 | CONFIG_PWM_IMX=y | 257 | CONFIG_PWM_IMX=y |