summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-11-20 12:31:00 +0000
committerPeter Robinson <pbrobinson@gmail.com>2016-11-20 12:31:00 +0000
commite7ad6855f5641750963559d88a34fb0168ea620d (patch)
tree2fcee7df80245849ff9aab0e5912b4c37f79e53d /config-generic
parent3bd733ade1d708454d55a0515adb7f92b85a263f (diff)
downloadkernel-e7ad6855f5641750963559d88a34fb0168ea620d.tar.gz
kernel-e7ad6855f5641750963559d88a34fb0168ea620d.tar.xz
kernel-e7ad6855f5641750963559d88a34fb0168ea620d.zip
Various ARMv7/aarch64 updates, Enable CEC media input devices, General config cleanups (NFC)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic55
1 files changed, 10 insertions, 45 deletions
diff --git a/config-generic b/config-generic
index 6b141c94a..36600d849 100644
--- a/config-generic
+++ b/config-generic
@@ -219,19 +219,14 @@ CONFIG_BINFMT_MISC=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CDCE925 is not set
# CONFIG_COMMON_CLK_CS2000_CP is not set
# CONFIG_COMMON_CLK_PWM is not set
-# CONFIG_COMMON_CLK_CDCE925 is not set
-# CONFIG_COMMON_CLK_OXNAS is not set
# CONFIG_COMMON_CLK_HI3519 is not set
-# CONFIG_SUNXI_CCU is not set
-# CONFIG_COMMON_CLK_MT8135 is not set
-# CONFIG_COMMON_CLK_MT8173 is not set
# CONFIG_SUN6I_A31_CCU is not set
# CONFIG_SUN8I_A23_CCU is not set
# CONFIG_SUN8I_A33_CCU is not set
-
#
# Generic Driver Options
#
@@ -348,7 +343,6 @@ CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_NAND_HISI504 is not set
# CONFIG_MTD_NAND_DENALI_PCI is not set
# CONFIG_MTD_NAND_DENALI_DT is not set
-# CONFIG_MTD_NAND_OMAP2 is not set
# CONFIG_MTD_LPDDR is not set
CONFIG_MTD_UBI=m
CONFIG_MTD_UBI_WL_THRESHOLD=4096
@@ -614,11 +608,11 @@ CONFIG_SCSI_SNIC=m
CONFIG_ATA=y
CONFIG_ATA_BMDMA=y
+CONFIG_ATA_GENERIC=m
CONFIG_ATA_VERBOSE_ERROR=y
CONFIG_ATA_SFF=y
CONFIG_ATA_PIIX=y
# CONFIG_SATA_DWC is not set
-# CONFIG_SATA_HIGHBANK is not set
CONFIG_ATA_ACPI=y
CONFIG_BLK_DEV_SX8=m
CONFIG_PDC_ADMA=m
@@ -657,7 +651,6 @@ CONFIG_PATA_CS5535=m
CONFIG_PATA_CS5536=m
CONFIG_PATA_CYPRESS=m
CONFIG_PATA_EFAR=m
-CONFIG_ATA_GENERIC=m
CONFIG_PATA_HPT366=m
CONFIG_PATA_HPT37X=m
CONFIG_PATA_HPT3X2N=m
@@ -2078,6 +2071,9 @@ CONFIG_HAMRADIO=y
CONFIG_AX25=m
CONFIG_AX25_DAMA_SLAVE=y
+#
+# Controller Area Network support
+#
CONFIG_CAN=m
CONFIG_CAN_RAW=m
CONFIG_CAN_BCM=m
@@ -3389,25 +3385,9 @@ CONFIG_R3964=m
# CONFIG_APPLICOM is not set
# CONFIG_SONYPI is not set
-#
-# AGP Support
-#
-CONFIG_AGP=y
-CONFIG_AGP_ALI=y
-CONFIG_AGP_ATI=y
-CONFIG_AGP_AMD=y
-CONFIG_AGP_AMD64=y
-CONFIG_AGP_INTEL=y
-CONFIG_AGP_NVIDIA=y
-CONFIG_AGP_SIS=y
-CONFIG_AGP_SWORKS=y
-CONFIG_AGP_VIA=y
-CONFIG_AGP_EFFICEON=y
-
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
-
CONFIG_DRM=m
CONFIG_DRM_ANALOGIX_ANX78XX=m
# CONFIG_DRM_ARCPGU is not set
@@ -3458,7 +3438,6 @@ CONFIG_DRM_VIRTIO_GPU=m
# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
CONFIG_DRM_VGEM=m
-# CONFIG_DRM_MALI_DISPLAY is not set
# CONFIG_DRM_SII902X is not set
# CONFIG_DRM_TOSHIBA_TC358767 is not set
# CONFIG_DRM_I2C_ADV7533 is not set
@@ -4105,10 +4084,9 @@ CONFIG_USB_UAS=m
#
# USB Human Interface Devices (HID)
#
-CONFIG_USB_HID=y
-
CONFIG_HID=y
+CONFIG_USB_HID=y
CONFIG_I2C_HID=m
CONFIG_HID_BATTERY_STRENGTH=y
# debugging default is y upstream now
@@ -4873,11 +4851,10 @@ CONFIG_UNIXWARE_DISKLABEL=y
# CONFIG_ULTRIX_PARTITION is not set
# CONFIG_CMDLINE_PARTITION is not set
-CONFIG_NLS=y
-
#
# Native Language Support
#
+CONFIG_NLS=y
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_737=m
@@ -5059,7 +5036,6 @@ CONFIG_SECCOMP=y
CONFIG_STRICT_DEVMEM=y
CONFIG_IO_STRICT_DEVMEM=y
-
#
# Cryptographic options
#
@@ -5151,10 +5127,6 @@ CONFIG_CRYPTO_DRBG_HASH=y
CONFIG_CRYPTO_DRBG_CTR=y
CONFIG_CRYPTO_KEYWRAP=m
-
-
-# Random number generation
-
#
# Library routines
#
@@ -5323,8 +5295,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
CONFIG_CPU_FREQ_STAT=y
CONFIG_CPU_FREQ_STAT_DETAILS=y
-
-
# CONFIG_MOUSE_ATIXL is not set
CONFIG_RADIO_ADAPTERS=y
@@ -5432,7 +5402,6 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
# CONFIG_SND_SOC_TLV320AIC31XX is not set
# CONFIG_SND_SOC_TAS2552 is not set
# CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_IMX_ES8328 is not set
# CONFIG_SND_SOC_FSL_ASOC_CARD is not set
# CONFIG_SND_EDMA_SOC is not set
# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
@@ -5461,8 +5430,6 @@ CONFIG_SND_SOC_AMD_ACP=m
# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SIMPLE_SCU_CARD is not set
-
-
CONFIG_BALLOON_COMPACTION=y
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
@@ -5481,8 +5448,6 @@ CONFIG_LEDS_CLASS_FLASH=m
# CONFIG_LEDS_TLC591XX is not set
# CONFIG_LEDS_KTD2692 is not set
# CONFIG_LEDS_AAT1290 is not set
-#
-CONFIG_LEDS_DELL_NETBOOKS=m
# CONFIG_LEDS_TCA6507 is not set
# CONFIG_LEDS_LM355x is not set
# CONFIG_LEDS_OT200 is not set
@@ -5767,7 +5732,9 @@ CONFIG_STAGING=y
# CONFIG_GREYBUS is not set
# CONFIG_STAGING_BOARD is not set
CONFIG_STAGING_MEDIA=y
-# CONFIG_MEDIA_CEC is not set
+CONFIG_MEDIA_CEC=y
+# CONFIG_MEDIA_CEC_DEBUG is not set
+CONFIG_USB_PULSE8_CEC=m
# CONFIG_DVB_AS102 is not set
# CONFIG_SLICOSS is not set
# CONFIG_VIDEO_DT3155 is not set
@@ -6056,8 +6023,6 @@ CONFIG_POWERCAP=y
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_GOV_LADDER is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
-
# CONFIG_HMC_DRV is not set
# CONFIG_PM_DEVFREQ is not set