summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2014-03-23 19:13:56 +0000
committerPeter Robinson <pbrobinson@gmail.com>2014-03-23 19:13:56 +0000
commit59a8033a4ac5116ddd7a6b6d7d2b2600dec9b01c (patch)
treee9d632dfe58972a3cd1d97d1168cd5f0185061c9 /config-arm-generic
parent21908595d0cccbd676398377b219a65c0516ac74 (diff)
downloadkernel-59a8033a4ac5116ddd7a6b6d7d2b2600dec9b01c.tar.gz
kernel-59a8033a4ac5116ddd7a6b6d7d2b2600dec9b01c.tar.xz
kernel-59a8033a4ac5116ddd7a6b6d7d2b2600dec9b01c.zip
Update some generic ARM config options
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic8
1 files changed, 5 insertions, 3 deletions
diff --git a/config-arm-generic b/config-arm-generic
index db9c50ee1..cd56b2493 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -29,8 +29,6 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
# CONFIG_ARM_DT_BL_CPUFREQ is not set
CONFIG_NR_CPUS=8
-CONFIG_ARM_DMA_USE_IOMMU=y
-# CONFIG_ARM_SMMU is not set
CONFIG_SWIOTLB=y
CONFIG_DMA_VIRTUAL_CHANNELS=y
CONFIG_FB_SIMPLE=y
@@ -40,10 +38,14 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
# ARM AMBA generic HW
CONFIG_ARM_AMBA=y
+CONFIG_ARM_CCI=y
+CONFIG_ARM_DMA_USE_IOMMU=y
CONFIG_ARM_GIC=y
+CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_ARM_SMMU=y
CONFIG_MMC_ARMMMCI=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIO_AMBAKMI=y
CONFIG_OC_ETM=y
CONFIG_FB_ARMCLCD=y