summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-11-13 22:24:12 +0000
committerPeter Robinson <pbrobinson@gmail.com>2013-11-13 22:24:12 +0000
commit30781672da3b2e0e0a9a591294f6ebccf331274d (patch)
tree34e913333f0b04b7f8f010a4ff19fa885265ead5 /config-arm-generic
parent04ee959ebf5f7336d47686bdffc4a0ab1717c18d (diff)
downloadkernel-30781672da3b2e0e0a9a591294f6ebccf331274d.tar.gz
kernel-30781672da3b2e0e0a9a591294f6ebccf331274d.tar.xz
kernel-30781672da3b2e0e0a9a591294f6ebccf331274d.zip
Update ARM configs:
- Move usb gadget from armv7 to armv70-generic - Cleanup some old OMAP config changes - Update a few config options based on a number of ARM defconfigs updated upstream - Fix up some conflicting or differing options between arm config files
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic5
1 files changed, 5 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 320da296f..c35084902 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -25,6 +25,7 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
CONFIG_NR_CPUS=8
CONFIG_ARM_DMA_USE_IOMMU=y
CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_FB_SIMPLE=y
# ARM AMBA generic HW
CONFIG_ARM_AMBA=y
@@ -89,6 +90,7 @@ CONFIG_MTD_PHYSMAP_OF=m
# GPIO
CONFIG_GPIO_DEVRES=y
CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
CONFIG_GPIOLIB=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -109,6 +111,9 @@ CONFIG_I2C_MUX_PCA9541=m
CONFIG_SENSORS_IIO_HWMON=m
CONFIG_IIO_SYSFS_TRIGGER=m
+# PHY framework
+CONFIG_GENERIC_PHY=m
+
# MFD
CONFIG_MFD_CORE=m