X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=kernel%2Fconfig-arm-generic;h=33b19ad7ce4e9c1b47016b325fea2a041fba97c0;hb=34520606fd7b689bdf33ed47212566bbb422c5b1;hp=2d1f04e31f5a4b0244007730ab18f3a1ef4788cd;hpb=93c5257574bcb41b989bbe9953ca339c95514e50;p=ipfire-3.x.git

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 2d1f04e31..33b19ad7c 100644
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -1,119 +1,56 @@
-CONFIG_ARM=y
-CONFIG_ARM_HAS_SG_CHAIN=y
-CONFIG_MIGHT_HAVE_PCI=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_ARM_PATCH_PHYS_VIRT=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_KERNEL_MODE_NEON=y
+CONFIG_PGTABLE_LEVELS=2
 
 #
 # IRQ subsystem
 #
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
 CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
+CONFIG_ARCH_HAS_TICK_BROADCAST=y
 
 #
 # Timers subsystem
 #
-CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_IDLE is not set
+CONFIG_NO_HZ_FULL=y
+# CONFIG_NO_HZ_FULL_ALL is not set
+# CONFIG_NO_HZ_FULL_SYSIDLE is not set
 
 #
 # CPU/Task time and stats accounting
 #
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 
 #
 # RCU Subsystem
 #
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_RCU_USER_QS=y
+# CONFIG_RCU_FAST_NO_HZ is not set
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ALL is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
 CONFIG_PERF_USE_VMALLOC=y
 
 #
 # Kernel Performance Events And Counters
 #
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
-CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
-CONFIG_OLD_SIGACTION=y
 
 #
-# GCOV-based kernel profiling
+# Platform selection
 #
-CONFIG_LBDAF=y
-
-#
-# System Type
-#
-CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_GEMINI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_W90X900 is not set
-# CONFIG_ARCH_LPC32XX is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_SHMOBILE_LEGACY is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP1 is not set
-
-#
-# CPU Core family selection
-#
-# CONFIG_ARCH_MULTI_V6 is not set
-
-#
-# Hisilicon platform type
-#
-CONFIG_ARCH_MXC=y
-# CONFIG_MXC_DEBUG_BOARD is not set
-
-#
-# OMAP Legacy Platform Data Board Type
-#
-# CONFIG_PLAT_SPEAR is not set
-
-#
-# Processor Type
-#
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-
-#
-# Processor Features
-#
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_ARM_THUMB=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-CONFIG_KUSER_HELPERS=y
-CONFIG_OUTER_CACHE=y
-CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
-CONFIG_MULTI_IRQ_HANDLER=y
+CONFIG_ARCH_VEXPRESS=y
 
 #
 # Bus support
 #
+CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PCI_MSI is not set
 # CONFIG_PCI_STUB is not set
@@ -124,66 +61,46 @@ CONFIG_PCI_SYSCALL=y
 #
 # PCI host controller drivers
 #
-CONFIG_PCI_HOST_GENERIC=y
-# CONFIG_PCCARD is not set
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
 
 #
-# Kernel Features
+# ARM errata workarounds via the alternatives framework
 #
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_AEABI=y
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-CONFIG_HIGHMEM=y
-# CONFIG_HIGHPTE is not set
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
-CONFIG_ALIGNMENT_TRAP=y
 
 #
 # Boot options
 #
-CONFIG_USE_OF=y
-CONFIG_ATAGS=y
-# CONFIG_DEPRECATED_PARAM_STRUCT is not set
-CONFIG_ZBOOT_ROM_TEXT=0
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-# CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
-CONFIG_AUTO_ZRELADDR=y
 
 #
-# CPU Frequency scaling
+# Power management options
 #
-CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_STAT_DETAILS is not set
-CONFIG_CPUFREQ_DT=m
+CONFIG_PM_OPP=y
+CONFIG_CPU_PM=y
 
 #
-# ARM CPU frequency scaling drivers
+# ARM CPU Idle Drivers
 #
-CONFIG_ARM_IMX6Q_CPUFREQ=m
+# CONFIG_ARM_CPUIDLE is not set
 
 #
-# At least one emulation must be selected
+# CPU Frequency scaling
 #
-CONFIG_VFP=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
 
 #
-# Power management options
+# CPU frequency scaling drivers
 #
-CONFIG_APM_EMULATION=y
-CONFIG_PM_OPP=y
-CONFIG_CPU_PM=y
-CONFIG_ARM_CPU_SUSPEND=y
+CONFIG_CPUFREQ_DT=m
+# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 
 #
 # Classification
@@ -198,11 +115,15 @@ CONFIG_BPF_JIT=y
 # CONFIG_RFKILL_REGULATOR is not set
 # CONFIG_RFKILL_GPIO is not set
 
+#
+# Device Drivers
+#
+CONFIG_ARM_AMBA=y
+CONFIG_TEGRA_AHB=y
+
 #
 # Generic Driver Options
 #
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_SOC_BUS=y
 CONFIG_DMA_CMA=y
 
 #
@@ -218,7 +139,9 @@ CONFIG_CMA_ALIGNMENT=8
 #
 # Bus devices
 #
-CONFIG_BRCMSTB_GISB_ARB=y
+CONFIG_ARM_CCI=y
+CONFIG_ARM_CCI400_COMMON=y
+CONFIG_ARM_CCI400_PMU=y
 # CONFIG_ARM_CCN is not set
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_DTC=y
@@ -227,7 +150,7 @@ CONFIG_OF=y
 #
 # Device Tree and Open Firmware support
 #
-# CONFIG_OF_SELFTEST is not set
+# CONFIG_OF_UNITTEST is not set
 CONFIG_OF_FLATTREE=y
 CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_ADDRESS=y
@@ -238,7 +161,12 @@ CONFIG_OF_MDIO=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 CONFIG_OF_RESERVED_MEM=y
+# CONFIG_OF_OVERLAY is not set
 # CONFIG_PARPORT is not set
+
+#
+# Protocols
+#
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 # CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
@@ -246,7 +174,6 @@ CONFIG_OF_RESERVED_MEM=y
 # CONFIG_BLK_DEV_NVME is not set
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_MG_DISK is not set
 # CONFIG_BLK_DEV_RSXX is not set
 
 #
@@ -262,32 +189,18 @@ CONFIG_VEXPRESS_SYSCFG=y
 # SCSI Transports
 #
 CONFIG_AIC79XX_RESET_DELAY_MS=5000
-CONFIG_AIC79XX_DEBUG_ENABLE=y
 CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_AIC94XX_DEBUG=y
-CONFIG_SCSI_MVSAS_DEBUG=y
 # CONFIG_SCSI_MVSAS_TASKLET is not set
 # CONFIG_MEGARAID_NEWGEN is not set
-CONFIG_SCSI_NSP32=m
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_AHCI_IMX=m
 
 #
-# PATA SFF controllers with BMDMA
+# PIO-only SFF controllers
 #
-CONFIG_PATA_IMX=m
+# CONFIG_PATA_OF_PLATFORM is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-# CONFIG_I2O_BUS is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
 CONFIG_MII=y
 # CONFIG_ATM_LANAI is not set
 # CONFIG_ATM_ENI is not set
@@ -300,71 +213,43 @@ CONFIG_MII=y
 # Distributed Switch Architecture drivers
 #
 CONFIG_AMD8111_ETH=y
-CONFIG_AMD_XGBE=m
 CONFIG_ARC_EMAC_CORE=m
 CONFIG_ARC_EMAC=m
 CONFIG_EMAC_ROCKCHIP=m
-CONFIG_NET_CADENCE=y
-CONFIG_BCMGENET=m
 CONFIG_SYSTEMPORT=m
 # CONFIG_CHELSIO_T1_1G is not set
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_CS89x0=m
-CONFIG_CS89x0_PLATFORM=y
-CONFIG_DM9000=m
-# CONFIG_DM9000_FORCE_SIMPLE_PHY_POLL is not set
 # CONFIG_DE2104X is not set
 # CONFIG_TULIP_MMIO is not set
 # CONFIG_TULIP_NAPI is not set
-CONFIG_NET_VENDOR_FARADAY=y
-CONFIG_FTMAC100=m
-CONFIG_FTGMAC100=m
-CONFIG_NET_VENDOR_FREESCALE=y
-CONFIG_FEC=m
-CONFIG_NET_VENDOR_HISILICON=y
-CONFIG_HIX5HD2_GMAC=m
 # CONFIG_I40E_VXLAN is not set
 # CONFIG_SKGE_GENESIS is not set
-CONFIG_AX88796=m
-CONFIG_AX88796_93CX6=y
 # CONFIG_QLCNIC_VXLAN is not set
 CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_8129 is not set
 CONFIG_SMC91X=m
-CONFIG_SMC911X=m
 # CONFIG_STMMAC_PCI is not set
 # CONFIG_VIA_RHINE_MMIO is not set
 
 #
 # MII PHY device drivers
 #
-CONFIG_AMD_XGBE_PHY=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-# CONFIG_ATH5K_DEBUG is not set
 CONFIG_WIL6210_TRACING=y
 # CONFIG_IPW2100_MONITOR is not set
 # CONFIG_IPW2200_MONITOR is not set
 # CONFIG_IPW2200_QOS is not set
 
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_APMPOWER is not set
-
 #
 # Input Device Drivers
 #
 # CONFIG_KEYBOARD_ADP5520 is not set
-CONFIG_KEYBOARD_IMX=m
-CONFIG_KEYBOARD_PMIC8XXX=m
 # CONFIG_KEYBOARD_STMPE is not set
 CONFIG_KEYBOARD_OMAP4=m
 # CONFIG_KEYBOARD_TC3589X is not set
-CONFIG_KEYBOARD_CAP1106=m
-# CONFIG_INPUT_PM8XXX_VIBRATOR is not set
-CONFIG_INPUT_PMIC8XXX_PWRKEY=m
+# CONFIG_KEYBOARD_CAP11XX is not set
+CONFIG_KEYBOARD_BCM=m
 CONFIG_INPUT_MAX77693_HAPTIC=m
 # CONFIG_INPUT_MAX8997_HAPTIC is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
@@ -376,6 +261,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
 #
 # Hardware I/O ports
 #
+# CONFIG_SERIO_AMBAKMI is not set
 CONFIG_SERIO_APBPS2=m
 
 #
@@ -387,25 +273,19 @@ CONFIG_SERIO_APBPS2=m
 # CONFIG_SYNCLINK_GT is not set
 # CONFIG_NOZOMI is not set
 
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250_EM=m
-
 #
 # Non-8250 serial port support
 #
+CONFIG_SERIAL_AMBA_PL010=m
+CONFIG_SERIAL_AMBA_PL011=m
 CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
-CONFIG_SERIAL_IMX=m
 # CONFIG_SERIAL_JSM is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
-CONFIG_SERIAL_ST_ASC=m
-# CONFIG_HVC_DCC is not set
-# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 
 #
 # Multiplexer I2C Chip support
@@ -424,53 +304,40 @@ CONFIG_I2C_SIS630=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
-CONFIG_I2C_IMX=m
-CONFIG_I2C_MV64XXX=m
 CONFIG_I2C_RK3X=m
+CONFIG_I2C_VERSATILE=m
 
 #
-# Pin controllers
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
-CONFIG_PINMUX=y
-CONFIG_PINCONF=y
-# CONFIG_PINCTRL_AS3722 is not set
-# CONFIG_PINCTRL_PALMAS is not set
-CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_OF_GPIO=y
 CONFIG_GPIO_GENERIC=y
 
 #
-# Memory mapped GPIO drivers:
+# Memory mapped GPIO drivers
 #
+CONFIG_GPIO_74XX_MMIO=m
+CONFIG_GPIO_ALTERA=m
 CONFIG_GPIO_GENERIC_PLATFORM=y
-# CONFIG_GPIO_DWAPB is not set
-# CONFIG_GPIO_EM is not set
-# CONFIG_GPIO_ZEVIO is not set
-CONFIG_GPIO_MXC=y
-# CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_GRGPIO is not set
+CONFIG_GPIO_PL061=y
+# CONFIG_GPIO_SYSCON is not set
 
 #
-# I2C GPIO expanders:
+# I2C GPIO expanders
 #
-# CONFIG_GPIO_STMPE is not set
 CONFIG_GPIO_ADNP=m
 
 #
-# PCI GPIO expanders:
-#
-# CONFIG_GPIO_BT8XX is not set
-
+# MFD GPIO expanders
 #
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_STMPE is not set
+# CONFIG_GPIO_TC3589X is not set
 
 #
-# 1-wire Slaves
+# USB GPIO expanders
 #
-# CONFIG_APM_POWER is not set
 # CONFIG_MAX8925_POWER is not set
 # CONFIG_WM831X_BACKUP is not set
 # CONFIG_WM831X_POWER is not set
@@ -483,31 +350,32 @@ CONFIG_GPIO_ADNP=m
 # CONFIG_CHARGER_TWL4030 is not set
 # CONFIG_CHARGER_MAX8997 is not set
 # CONFIG_CHARGER_MAX8998 is not set
-# CONFIG_CHARGER_TPS65090 is not set
 CONFIG_POWER_RESET_AS3722=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_LTC2952=y
-CONFIG_POWER_RESET_RESTART=y
-CONFIG_POWER_RESET_VERSATILE=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
 
 #
 # Native drivers
 #
 CONFIG_SENSORS_PWM_FAN=m
 CONFIG_SENSORS_VEXPRESS=m
+
+#
+# ACPI drivers
+#
 CONFIG_THERMAL_OF=y
 # CONFIG_CPU_THERMAL is not set
+CONFIG_CLOCK_THERMAL=y
 
 #
 # Watchdog Device Drivers
 #
 CONFIG_GPIO_WATCHDOG=m
-CONFIG_CADENCE_WATCHDOG=m
-CONFIG_MAX63XX_WATCHDOG=m
-CONFIG_IMX2_WDT=m
+CONFIG_ARM_SP805_WATCHDOG=m
 
 #
 # PCI-based Watchdog Cards
@@ -519,12 +387,9 @@ CONFIG_IMX2_WDT=m
 # Multifunction device drivers
 #
 CONFIG_MFD_AS3722=y
-# CONFIG_MFD_ASIC3 is not set
 CONFIG_MFD_HI6421_PMIC=m
-# CONFIG_HTC_EGPIO is not set
 # CONFIG_LPC_ICH is not set
-CONFIG_MFD_PM8XXX=m
-CONFIG_MFD_PM8921_CORE=m
+CONFIG_MFD_MAX77686=y
 # CONFIG_MFD_RTSX_PCI is not set
 CONFIG_MFD_RK808=m
 CONFIG_MFD_STMPE=y
@@ -533,16 +398,16 @@ CONFIG_MFD_STMPE=y
 # STMicroelectronics STMPE Interface Drivers
 #
 CONFIG_STMPE_I2C=y
-CONFIG_TWL4030_POWER=y
-# CONFIG_MFD_T7L66XB is not set
-# CONFIG_MFD_TC6387XB is not set
-# CONFIG_MFD_TC6393XB is not set
+CONFIG_MFD_TC3589X=y
+# CONFIG_MFD_VX855 is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
 CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_HI6421=m
+CONFIG_REGULATOR_MAX77686=m
+CONFIG_REGULATOR_MAX77802=m
 CONFIG_REGULATOR_PWM=m
 CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_TPS65218=m
@@ -566,7 +431,6 @@ CONFIG_DVB_TTUSB_DEC=y
 # CONFIG_VIDEO_CX23885 is not set
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_VIDEO_CX88 is not set
-# CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_SAA7134 is not set
 # CONFIG_VIDEO_SAA7164 is not set
 
@@ -581,8 +445,8 @@ CONFIG_DVB_TTUSB_DEC=y
 # CONFIG_DVB_PT1 is not set
 # CONFIG_MANTIS_CORE is not set
 # CONFIG_DVB_NGENE is not set
-CONFIG_VIDEO_MX3=m
-# CONFIG_VIDEO_CODA is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_XILINX is not set
 
 #
 # DVB-S (satellite) frontends
@@ -607,56 +471,36 @@ CONFIG_DVB_STV0297=y
 #
 CONFIG_DVB_LNBP21=y
 
-#
-# Graphics support
-#
-CONFIG_IMX_IPUV3_CORE=m
-
-#
-# Direct Rendering Manager
-#
-CONFIG_DRM_MIPI_DSI=y
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
-
 #
 # I2C encoder or helper chips
 #
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+CONFIG_DRM_PTN3460=m
+CONFIG_DRM_PS8622=m
 # CONFIG_DRM_RADEON is not set
 # CONFIG_DRM_NOUVEAU is not set
-CONFIG_DRM_EXYNOS=m
-CONFIG_DRM_EXYNOS_DMABUF=y
-CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_VIDI=y
-CONFIG_DRM_EXYNOS_G2D=y
-CONFIG_DRM_EXYNOS_IPP=y
-CONFIG_DRM_ARMADA=m
-# CONFIG_DRM_TILCDC is not set
-CONFIG_DRM_PANEL=y
 
 #
 # Display Panels
 #
-CONFIG_DRM_STI=m
-# CONFIG_DRM_STI_FBDEV is not set
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_S6E8AA0 is not set
 
 #
 # Frame buffer Devices
 #
-CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_BACKLIGHT is not set
 
 #
 # Frame buffer hardware drivers
 #
+# CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_SSD1307 is not set
+# CONFIG_LCD_PLATFORM is not set
 # CONFIG_BACKLIGHT_PWM is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_LP8788 is not set
-CONFIG_VIDEOMODE_HELPERS=y
 
 #
 # Console display driver support
@@ -664,11 +508,12 @@ CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_COMPRESS_OFFLOAD=m
 # CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ES1968_INPUT is not set
+# CONFIG_SND_MAESTRO3_INPUT is not set
 
 #
 # HD-Audio
 #
-CONFIG_SND_ARM=y
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_ATMEL_SOC=m
@@ -682,25 +527,8 @@ CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_ESAI=m
-CONFIG_SND_SOC_FSL_UTILS=m
-CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
-CONFIG_SND_IMX_SOC=m
-CONFIG_SND_SOC_IMX_SSI=m
-
-#
-# SoC Audio support for Freescale i.MX boards:
-#
-CONFIG_SND_SOC_EUKREA_TLV320=m
-CONFIG_SND_SOC_IMX_WM8962=m
-CONFIG_SND_SOC_IMX_ES8328=m
-CONFIG_SND_SOC_IMX_SGTL5000=m
-CONFIG_SND_SOC_IMX_SPDIF=m
-CONFIG_SND_SOC_FSL_ASOC_CARD=m
-
-#
-# SoC Audio support for SuperH
-#
+CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 
 #
@@ -712,20 +540,24 @@ CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK5386=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
 CONFIG_SND_SOC_CS42L52=m
 CONFIG_SND_SOC_CS42L56=m
 CONFIG_SND_SOC_CS42L73=m
 CONFIG_SND_SOC_CS4265=m
 CONFIG_SND_SOC_CS4270=m
 CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ES8328=m
-CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_PCM1681=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_RT5631=m
+# CONFIG_SND_SOC_RT5677_SPI is not set
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIGMADSP=m
 CONFIG_SND_SOC_SIGMADSP_I2C=m
@@ -734,13 +566,16 @@ CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_SSM2602_I2C=m
 CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
 CONFIG_SND_SOC_STA350=m
 CONFIG_SND_SOC_TAS2552=m
 CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TFA9879=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_TLV320AIC31XX=m
 CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
 CONFIG_SND_SOC_WM8580=m
@@ -753,6 +588,7 @@ CONFIG_SND_SOC_WM8750=m
 CONFIG_SND_SOC_WM8753=m
 CONFIG_SND_SOC_WM8776=m
 CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
 CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8962=m
 CONFIG_SND_SOC_WM8978=m
@@ -760,26 +596,22 @@ CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SIMPLE_CARD=m
 
 #
-# USB Imaging devices
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
 #
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
+CONFIG_USB_CHIPIDEA_OF=m
 
 #
 # USB Physical Layer drivers
 #
-CONFIG_AM335X_CONTROL_USB=m
-CONFIG_AM335X_PHY_USB=m
-CONFIG_USB_MXS_PHY=m
 CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
 
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_SDHCI_IO_ACCESSORS=y
-CONFIG_MMC_SDHCI_OF_ARASAN=m
-CONFIG_MMC_SDHCI_ESDHC_IMX=m
-CONFIG_MMC_MXC=m
+CONFIG_MMC_ARMMMCI=m
+# CONFIG_MMC_RICOH_MMC is not set
+CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_IDMAC=y
 CONFIG_MMC_DW_PLTFM=m
@@ -788,67 +620,87 @@ CONFIG_MMC_DW_K3=m
 CONFIG_MMC_DW_PCI=m
 
 #
-# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+# LED drivers
 #
-CONFIG_LEDS_SYSCON=y
+CONFIG_LEDS_PWM=m
 
 #
-# iptables trigger is under Netfilter config (LED target)
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 #
-# CONFIG_EDAC is not set
+CONFIG_LEDS_SYSCON=y
 
 #
 # I2C RTC drivers
 #
 CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_HYM8563=m
+CONFIG_RTC_DRV_MAX77686=m
 CONFIG_RTC_DRV_RK808=m
+CONFIG_RTC_DRV_MAX77802=m
 
 #
 # on-CPU RTC drivers
 #
-CONFIG_RTC_DRV_IMXDI=m
-CONFIG_RTC_DRV_PM8XXX=m
-CONFIG_RTC_DRV_MXC=m
+CONFIG_RTC_DRV_PL030=m
+CONFIG_RTC_DRV_PL031=m
 CONFIG_RTC_DRV_SNVS=m
 
 #
 # DMA Devices
 #
+# CONFIG_AMBA_PL08X is not set
 # CONFIG_DW_DMAC is not set
-CONFIG_MX3_IPU=y
-CONFIG_MX3_IPU_IRQS=4
+# CONFIG_DW_DMAC_PCI is not set
+# CONFIG_PL330_DMA is not set
 CONFIG_FSL_EDMA=m
-CONFIG_NBPFAXI_DMA=m
-CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 
+#
+# DMA Clients
+#
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_SERCOS3 is not set
+# CONFIG_UIO_PCI_GENERIC is not set
+# CONFIG_UIO_MF624 is not set
+
+#
+# Android
+#
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+# CONFIG_I2O_BUS is not set
+# CONFIG_I2O_BLOCK is not set
+# CONFIG_I2O_SCSI is not set
+# CONFIG_I2O_PROC is not set
+
 #
 # Common Clock Framework
 #
+CONFIG_COMMON_CLK_WM831X=y
+CONFIG_COMMON_CLK_VERSATILE=y
+CONFIG_CLK_SP810=y
+CONFIG_CLK_VEXPRESS_OSC=y
+CONFIG_COMMON_CLK_MAX_GEN=y
+CONFIG_COMMON_CLK_MAX77686=y
+CONFIG_COMMON_CLK_MAX77802=m
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SI570=m
-CONFIG_COMMON_CLK_QCOM=m
-CONFIG_APQ_GCC_8084=m
-CONFIG_APQ_MMCC_8084=m
-CONFIG_IPQ_GCC_806X=m
-CONFIG_MSM_GCC_8660=m
-CONFIG_MSM_GCC_8960=m
-CONFIG_MSM_MMCC_8960=m
-CONFIG_MSM_GCC_8974=m
-CONFIG_MSM_MMCC_8974=m
+CONFIG_COMMON_CLK_PWM=m
 
 #
 # Clock Source drivers
 #
 CONFIG_CLKSRC_OF=y
 CONFIG_CLKSRC_MMIO=y
-CONFIG_CLKSRC_VERSATILE=y
-CONFIG_OF_IOMMU=y
+CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
+CONFIG_ARM_MHU=m
 
 #
 # Analog to digital converters
 #
+# CONFIG_LP8788_ADC is not set
+# CONFIG_TWL6030_GPADC is not set
 CONFIG_VF610_ADC=m
 
 #
@@ -861,35 +713,32 @@ CONFIG_MAX5821=m
 #
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_LP3943 is not set
+# CONFIG_PWM_PCA9685 is not set
+# CONFIG_PWM_TWL is not set
+# CONFIG_PWM_TWL_LED is not set
 CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC=y
 
 #
-# Memory Debugging
+# Firmware Drivers
 #
-# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
 
 #
 # RCU Debugging
 #
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_FTRACE_SYSCALLS is not set
 
 #
 # Runtime Testing
 #
-# CONFIG_ARM_PTDUMP is not set
-CONFIG_ARM_UNWIND=y
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_LL is not set
-CONFIG_DEBUG_IMX_UART_PORT=1
-# CONFIG_DEBUG_UART_PL01X is not set
-# CONFIG_DEBUG_UART_8250 is not set
-CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+# CONFIG_PID_IN_CONTEXTIDR is not set
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
-
-#
-# Executable Protections
-#
-# CONFIG_GRKERNSEC_SETXID is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_CORESIGHT is not set
 
 #
 # Logging Options
@@ -900,6 +749,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
 # Crypto core or helper
 #
 CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_ABLK_HELPER=m
 
 #
 # Block modes
@@ -907,25 +757,9 @@ CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_XTS=m
 
-#
-# Digest
-#
-CONFIG_CRYPTO_SHA1_ARM=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES_ARM=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_DEV_SAHARA=m
-
 #
 # Library routines
 #
-CONFIG_STMP_DEVICE=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_AUDIT_GENERIC=y
 CONFIG_LIBFDT=y