summaryrefslogtreecommitdiffstats
path: root/config-armv7-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-04-22 15:51:31 +0100
committerPeter Robinson <pbrobinson@gmail.com>2015-04-22 15:51:31 +0100
commit9c16b2432a4eb020b409a1bf94f02f189acbf02f (patch)
tree04b7ae327d97d5f3c834b8bec0a984a5e49dbd66 /config-armv7-generic
parent2bfd285dcd565cac5479de29495459b6b55627b6 (diff)
downloadkernel-9c16b2432a4eb020b409a1bf94f02f189acbf02f.tar.gz
kernel-9c16b2432a4eb020b409a1bf94f02f189acbf02f.tar.xz
kernel-9c16b2432a4eb020b409a1bf94f02f189acbf02f.zip
Inital ARM updates for 4.1, Temporarily disable AMD ARM64 xgbe-a0 driver
Diffstat (limited to 'config-armv7-generic')
-rw-r--r--config-armv7-generic22
1 files changed, 0 insertions, 22 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index e321d8a1f..98812599d 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -14,7 +14,6 @@ CONFIG_VFP=y
CONFIG_VFPv3=y
CONFIG_NEON=y
CONFIG_IWMMXT=y
-CONFIG_KERNEL_MODE_NEON=y
CONFIG_ARM_UNWIND=y
CONFIG_ARM_THUMB=y
@@ -46,7 +45,6 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
# CONFIG_HVC_DCC is not set
# CONFIG_XIP_KERNEL is not set
# CONFIG_ARM_VIRT_EXT is not set
-# CONFIG_ARM_CPUIDLE is not set
# Platforms enabled/disabled globally on ARMv7
CONFIG_ARCH_EXYNOS=y
@@ -117,11 +115,6 @@ CONFIG_RCU_FANOUT=32
CONFIG_CHECKPOINT_RESTORE=y
# Power management / thermal / cpu scaling
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
-
CONFIG_PM_OPP=y
CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARM_PSCI=y
@@ -606,29 +599,15 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m
CONFIG_I2C_MV64XXX=m
# HW crypto and rng
-CONFIG_ARM_CRYPTO=y
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-# CONFIG_CRYPTO_AES_ARM_BS is not set
-CONFIG_CRYPTO_SHA1_ARM_NEON=m
-CONFIG_CRYPTO_SHA512_ARM_NEON=m
# CONFIG_CRYPTO_SHA1_ARM_CE is not set
# CONFIG_CRYPTO_SHA2_ARM_CE is not set
-CONFIG_CRYPTO_SHA256_ARM=m
# CONFIG_CRYPTO_AES_ARM_CE is not set
# CONFIG_CRYPTO_GHASH_ARM_CE is not set
-
# DMA
CONFIG_TI_PRIV_EDMA=y
CONFIG_TI_EDMA=y
-# Watchdog
-
-# Mailbox
-CONFIG_MAILBOX=y
-# CONFIG_ARM_MHU is not set
-
# MTD
# CONFIG_MG_DISK is not set
CONFIG_MTD_DATAFLASH=m
@@ -661,7 +640,6 @@ CONFIG_EEPROM_93XX46=m
# Sound
CONFIG_SND_ARM=y
CONFIG_SND_SOC_AC97_BUS=y
-# CONFIG_SND_SOC_QCOM is not set
# Displays
CONFIG_BACKLIGHT_TPS65217=m