summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-07-15 00:18:10 +0100
committerPeter Robinson <pbrobinson@gmail.com>2013-07-15 00:18:10 +0100
commit654446dc9c17e7ba3d72514fc452b9f85ef70799 (patch)
tree3c12e67808bdf2bf793ecbd59dc893a68d908bcf /config-arm-generic
parent5fae89b73bb128cd2b6de65ad600716852877de4 (diff)
downloadkernel-654446dc9c17e7ba3d72514fc452b9f85ef70799.tar.gz
kernel-654446dc9c17e7ba3d72514fc452b9f85ef70799.tar.xz
kernel-654446dc9c17e7ba3d72514fc452b9f85ef70799.zip
Update ARM config
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic9
1 files changed, 5 insertions, 4 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 85925237c..25144b506 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -35,6 +35,11 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_ARM_SP805_WATCHDOG=m
+
+# ARM VExpress
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_VEXPRESS_CONFIG=y
# Device tree
CONFIG_OF=y
@@ -73,10 +78,6 @@ CONFIG_MDIO_GPIO=m
# CONFIG_CRYPTO_TEST is not set
# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_XEN is not set
-
-# FIX ME
-# CONFIG_POWER_RESET_VEXPRESS is not set
-# CONFIG_VEXPRESS_CONFIG is not set
# CONFIG_DRM_RCAR_DU is not set
# CONFIG_DRM_SHMOBILE is not set
# CONFIG_MMC_DW_SOCFPGA is not set