summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-09-14 11:50:12 +0100
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-15 09:26:48 -0400
commite06aa27ce7d1fe4301e85788600bd0e31459d9ea (patch)
tree772f98f6f5ee40cd1262ce20a732ebef53187d04 /config-armv7
parenta8089a3aba84b389af65493f02fab38c0714cd91 (diff)
downloadkernel-e06aa27ce7d1fe4301e85788600bd0e31459d9ea.tar.gz
kernel-e06aa27ce7d1fe4301e85788600bd0e31459d9ea.tar.xz
kernel-e06aa27ce7d1fe4301e85788600bd0e31459d9ea.zip
Minor ARMv7/aarch64 config updates
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv716
1 files changed, 16 insertions, 0 deletions
diff --git a/config-armv7 b/config-armv7
index b3a496c46..b39acc274 100644
--- a/config-armv7
+++ b/config-armv7
@@ -65,6 +65,9 @@ CONFIG_TWL4030_MADC=m
CONFIG_TWL4030_POWER=y
CONFIG_TWL4030_WATCHDOG=m
CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_BATTERY_BQ27x00=m
+CONFIG_BATTERY_BQ27X00_I2C=y
+CONFIG_BATTERY_BQ27X00_PLATFORM=y
CONFIG_OMAP_USB2=m
CONFIG_OMAP_CONTROL_PHY=m
CONFIG_TI_PIPE3=m
@@ -264,6 +267,9 @@ CONFIG_VIDEO_AM437X_VPFE=m
CONFIG_UIO_PRUSS=m
CONFIG_WKUP_M3_RPROC=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+
# QCom
CONFIG_ARCH_MSM8X60=y
CONFIG_ARCH_MSM8960=y
@@ -384,6 +390,16 @@ CONFIG_IMX_WEIM=y
CONFIG_IMX2_WDT=m
CONFIG_HW_RANDOM_MXC_RNGA=m
CONFIG_CRYPTO_DEV_SAHARA=m
+CONFIG_CRYPTO_DEV_FSL_CAAM=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=3
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_COUNT_THLD=8
+CONFIG_CRYPTO_DEV_FSL_CAAM_INTC_TIME_THLD=8192
+CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=m
+CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=m
+# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set
CONFIG_RTC_DRV_SNVS=m
CONFIG_FB_MXS=m
# CONFIG_FB_MX3 is not set