summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-11-03 11:59:27 +0000
committerPeter Robinson <pbrobinson@gmail.com>2015-11-03 11:59:27 +0000
commitb4eeb683096694126733211ba4b2adba03ae68b1 (patch)
treee1f8215b4799cef4d13844d77f457a39403cb7d2 /config-arm-generic
parentff953c8de2dc89a90ba8424123d9177f6623e1cc (diff)
downloadkernel-b4eeb683096694126733211ba4b2adba03ae68b1.tar.gz
kernel-b4eeb683096694126733211ba4b2adba03ae68b1.tar.xz
kernel-b4eeb683096694126733211ba4b2adba03ae68b1.zip
Add patch to fix crash in omap_wdt (headed upstream), Build in ARM generic crypto optomisation modules, Minor ARM updates
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic19
1 files changed, 10 insertions, 9 deletions
diff --git a/config-arm-generic b/config-arm-generic
index d72e87119..c8984594e 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -68,6 +68,16 @@ CONFIG_GPIO_PL061=y
CONFIG_USB_ISP1760=m
CONFIG_ARM_PL172_MPMC=m
+# HW crypto and rng
+CONFIG_ARM_CRYPTO=y
+CONFIG_CRYPTO_AES_ARM=y
+CONFIG_CRYPTO_AES_ARM_BS=y
+CONFIG_CRYPTO_SHA1_ARM=y
+CONFIG_CRYPTO_SHA256_ARM=y
+CONFIG_CRYPTO_SHA1_ARM_NEON=y
+CONFIG_CRYPTO_SHA512_ARM_NEON=y
+CONFIG_CRYPTO_SHA512_ARM=y
+
# ARM VExpress
CONFIG_ARCH_VEXPRESS=y
CONFIG_MFD_VEXPRESS_SYSREG=y
@@ -127,15 +137,6 @@ CONFIG_MAILBOX=y
CONFIG_ARM_MHU=m
# CONFIG_PL320_MBOX is not set
-# HW crypto and rng
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_AES_ARM=m
-# CONFIG_CRYPTO_AES_ARM_BS is not set
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_SHA256_ARM=m
-CONFIG_CRYPTO_SHA1_ARM_NEON=m
-CONFIG_CRYPTO_SHA512_ARM_NEON=m
-CONFIG_CRYPTO_SHA512_ARM=m
# USB
CONFIG_USB_OHCI_HCD_PLATFORM=m
CONFIG_USB_EHCI_HCD_PLATFORM=m