summaryrefslogtreecommitdiffstats
path: root/config-arm-imx
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2011-12-23 10:28:07 -0600
committerDennis Gilmore <dennis@ausil.us>2011-12-23 10:28:48 -0600
commit1cbcbe6c389c712d7368ba171bd0b00fe8e32819 (patch)
tree1ada80657844e6afa7e08fbf12f0bb23f6c88b82 /config-arm-imx
parent534352f358b444bf67c24181516d90d4ca59ed46 (diff)
downloadkernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.tar.gz
kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.tar.xz
kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.zip
pull in the arm config changes from f15
Diffstat (limited to 'config-arm-imx')
-rw-r--r--config-arm-imx20
1 files changed, 20 insertions, 0 deletions
diff --git a/config-arm-imx b/config-arm-imx
index a491b8cab..5ed7ae2ed 100644
--- a/config-arm-imx
+++ b/config-arm-imx
@@ -6,6 +6,14 @@ CONFIG_MACH_EUKREA_CPUIMX51=y
CONFIG_VFP=y
CONFIG_NEON=y
+CONFIG_MACH_EUKREA_CPUIMX51SD=y
+CONFIG_MACH_MX51_EFIKAMX=y
+CONFIG_MACH_MX51_EFIKASB=y
+# CONFIG_SWP_EMULATE is not set
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_CPU_FREQ_IMX=y
+CONFIG_W1_MASTER_MXC=m
+CONFIG_IMX_SDMA=y
CONFIG_MACH_MX31ADS=y
CONFIG_MACH_MX31LILLY=y
CONFIG_MACH_MX31LITE=y
@@ -73,3 +81,15 @@ CONFIG_IMX2_WDT=m
CONFIG_SND_SOC_PHYCORE_AC97=m
CONFIG_SND_SOC_EUKREA_TLV320=m
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEBUG=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_STAT_DETAILS=y