diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/imx6_defconfig | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig index 88f9e814cee4..558d5bcfcad2 100644 --- a/arch/arm/configs/imx6_defconfig +++ b/arch/arm/configs/imx6_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.38 Kernel Configuration -# Mon Aug 29 18:28:10 2011 +# Thu Sep 15 18:47:42 2011 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -294,7 +294,6 @@ CONFIG_IMX_HAVE_PLATFORM_IMX_ASRC=y # CONFIG_ARCH_MX5 is not set CONFIG_ARCH_MX6=y CONFIG_FORCE_MAX_ZONEORDER=13 -CONFIG_DMA_ZONE_SIZE=184 CONFIG_ARCH_MX6Q=y CONFIG_SOC_IMX6Q=y CONFIG_MACH_MX6Q_SABREAUTO=y @@ -309,6 +308,7 @@ CONFIG_MXC_PWM=y CONFIG_ARCH_MXC_IOMUX_V3=y CONFIG_IRAM_ALLOC=y CONFIG_CLK_DEBUG=y +CONFIG_DMA_ZONE_SIZE=184 # # System MMU @@ -440,7 +440,7 @@ CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -#CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set +# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y # CONFIG_CPU_FREQ_GOV_ONDEMAND is not set @@ -1350,6 +1350,7 @@ CONFIG_FB_MODE_HELPERS=y # # CONFIG_FB_UVESA is not set # CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_TMIO is not set # CONFIG_FB_UDL is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set @@ -1869,6 +1870,11 @@ CONFIG_MXC_ASRC=y # # +# MXC GPU support +# +CONFIG_MXC_GPU_VIV=y + +# # ANATOP_THERMAL # CONFIG_ANATOP_THERMAL=y |