kernel: Update to 3.15.6.
[people/ms/ipfire-3.x.git] / kernel / config-armv7hl-default
index 0f9716e..e3a135c 100644 (file)
@@ -1,7 +1,7 @@
+CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_MIGHT_HAVE_PCI=y
-CONFIG_NO_IOPORT=y
+CONFIG_NO_IOPORT_MAP=y
 CONFIG_ARCH_HAS_BANDGAP=y
-CONFIG_FIQ=y
 
 #
 # IRQ subsystem
@@ -13,15 +13,13 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 #
 # Timers subsystem
 #
-# CONFIG_NO_HZ_IDLE is not set
-CONFIG_NO_HZ_FULL=y
-CONFIG_NO_HZ_FULL_ALL=y
-# CONFIG_NO_HZ_FULL_SYSIDLE is not set
+# CONFIG_NO_HZ_FULL is not set
 
 #
 # CPU/Task time and stats accounting
 #
 CONFIG_VIRT_CPU_ACCOUNTING=y
+# CONFIG_TICK_CPU_ACCOUNTING is not set
 CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 
 #
@@ -30,14 +28,13 @@ CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_TREE_RCU=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_CONTEXT_TRACKING=y
-CONFIG_RCU_USER_QS=y
+# CONFIG_RCU_USER_QS is not set
 CONFIG_CONTEXT_TRACKING_FORCE=y
 CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
-CONFIG_RCU_FAST_NO_HZ=y
-CONFIG_RCU_NOCB_CPU=y
-CONFIG_RCU_NOCB_CPU_ALL=y
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_RCU_NOCB_CPU is not set
 
 #
 # Kernel Performance Events And Counters
@@ -47,7 +44,6 @@ CONFIG_SLUB_CPU_PARTIAL=y
 #
 # IO Schedulers
 #
-CONFIG_PADATA=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 
 #
@@ -59,132 +55,68 @@ CONFIG_ARCH_MULTIPLATFORM=y
 #
 # CPU Core family selection
 #
-CONFIG_ARCH_MULTI_V6=y
+# CONFIG_ARCH_MULTI_V6 is not set
 CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MULTI_V6_V7=y
 # CONFIG_ARCH_MULTI_CPU_AUTO is not set
+CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_MVEBU=y
 
 #
-# Marvell SOC with device tree
+# Marvell EBU SoC variants
 #
-CONFIG_MACH_ARMADA_370_XP=y
+CONFIG_MACH_MVEBU_V7=y
 CONFIG_MACH_ARMADA_370=y
+CONFIG_MACH_ARMADA_375=y
+CONFIG_MACH_ARMADA_38X=y
 CONFIG_MACH_ARMADA_XP=y
+CONFIG_MACH_DOVE=y
 CONFIG_ARCH_BCM=y
 
 #
 # Broadcom SoC Selection
 #
 # CONFIG_ARCH_BCM_MOBILE is not set
-CONFIG_ARCH_BCM2835=y
+CONFIG_ARCH_BCM_5301X=y
 CONFIG_ARCH_BERLIN=y
 
 #
 # Marvell Berlin SoC variants
 #
-CONFIG_MACH_BERLIN_BG2=y
-CONFIG_MACH_BERLIN_BG2CD=y
-# CONFIG_ARCH_CNS3XXX is not set
+# CONFIG_MACH_BERLIN_BG2 is not set
+# CONFIG_MACH_BERLIN_BG2CD is not set
 CONFIG_ARCH_HIGHBANK=y
 CONFIG_ARCH_HI3xxx=y
 CONFIG_ARCH_KEYSTONE=y
-CONFIG_ARCH_MSM=y
-CONFIG_ARCH_MSM_DT=y
-
-#
-# Qualcomm MSM SoC Selection
-#
-CONFIG_ARCH_MSM8X60=y
-CONFIG_ARCH_MSM8960=y
-CONFIG_ARCH_MSM8974=y
-CONFIG_MSM_SCM=y
-CONFIG_MSM_TIMER=y
 CONFIG_ARCH_MXC=y
 
 #
 # Freescale i.MX support
 #
-CONFIG_MXC_TZIC=y
-CONFIG_MXC_AVIC=y
-CONFIG_MXC_DEBUG_BOARD=y
-CONFIG_MXC_USE_EPIT=y
-CONFIG_ARCH_HAS_RNGA=y
-CONFIG_ARCH_MXC_IOMUX_V3=y
-CONFIG_SOC_IMX31=y
-CONFIG_SOC_IMX35=y
-CONFIG_SOC_IMX5=y
-CONFIG_SOC_IMX51=y
-
-#
-# MX31 platforms:
-#
-CONFIG_MACH_MX31ADS=y
-CONFIG_MACH_MX31LILLY=y
-CONFIG_MACH_MX31LITE=y
-CONFIG_MACH_PCM037=y
-CONFIG_MACH_PCM037_EET=y
-CONFIG_MACH_MX31_3DS=y
-# CONFIG_MACH_MX31_3DS_MXC_NAND_USE_BBT is not set
-CONFIG_MACH_MX31MOBOARD=y
-CONFIG_MACH_QONG=y
-CONFIG_MACH_ARMADILLO5X0=y
-CONFIG_MACH_KZM_ARM11_01=y
-CONFIG_MACH_BUG=y
-CONFIG_MACH_IMX31_DT=y
-
-#
-# MX35 platforms:
-#
-CONFIG_MACH_IMX35_DT=y
-CONFIG_MACH_PCM043=y
-CONFIG_MACH_MX35_3DS=y
-CONFIG_MACH_EUKREA_CPUIMX35SD=y
-CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD=y
-CONFIG_MACH_VPR200=y
+# CONFIG_MXC_DEBUG_BOARD is not set
 
 #
 # i.MX51 machines:
 #
-CONFIG_MACH_IMX51_DT=y
-CONFIG_MACH_MX51_BABBAGE=y
-CONFIG_MACH_EUKREA_CPUIMX51SD=y
-CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD=y
+# CONFIG_MACH_IMX51_DT is not set
+# CONFIG_MACH_MX51_BABBAGE is not set
+# CONFIG_MACH_EUKREA_CPUIMX51SD is not set
 
 #
 # Device tree only
 #
-CONFIG_SOC_IMX50=y
-CONFIG_SOC_IMX53=y
+# CONFIG_SOC_IMX50 is not set
+# CONFIG_SOC_IMX53 is not set
+CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_VF610=y
-CONFIG_IMX_HAVE_PLATFORM_FEC=y
-CONFIG_IMX_HAVE_PLATFORM_FLEXCAN=y
-CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC=y
-CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS=y
-CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT=y
-CONFIG_IMX_HAVE_PLATFORM_IMX_FB=y
-CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
-CONFIG_IMX_HAVE_PLATFORM_IMX_KEYPAD=y
-CONFIG_IMX_HAVE_PLATFORM_IMX_SSI=y
-CONFIG_IMX_HAVE_PLATFORM_IMX_UART=y
-CONFIG_IMX_HAVE_PLATFORM_IPU_CORE=y
-CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI=y
-CONFIG_IMX_HAVE_PLATFORM_MXC_MMC=y
-CONFIG_IMX_HAVE_PLATFORM_MXC_NAND=y
-CONFIG_IMX_HAVE_PLATFORM_MXC_RNGA=y
-CONFIG_IMX_HAVE_PLATFORM_MXC_RTC=y
-CONFIG_IMX_HAVE_PLATFORM_MXC_W1=y
-CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX=y
-CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
 
 #
 # OMAP Feature Selections
 #
-CONFIG_POWER_AVS_OMAP=y
-CONFIG_POWER_AVS_OMAP_CLASS3=y
-CONFIG_OMAP_RESET_CLOCKS=y
+# CONFIG_POWER_AVS_OMAP is not set
+# CONFIG_OMAP_RESET_CLOCKS is not set
 CONFIG_OMAP_MUX=y
 # CONFIG_OMAP_MUX_DEBUG is not set
 CONFIG_OMAP_MUX_WARNINGS=y
@@ -194,7 +126,6 @@ CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_MACH_OMAP_GENERIC=y
 CONFIG_ARCH_OMAP=y
-# CONFIG_ARCH_OMAP2 is not set
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
 CONFIG_SOC_OMAP5=y
@@ -224,7 +155,7 @@ CONFIG_MACH_OMAP3530_LV_SOM=y
 CONFIG_MACH_OMAP3_TORPEDO=y
 CONFIG_MACH_OVERO=y
 CONFIG_MACH_OMAP3517EVM=y
-CONFIG_MACH_CRANEBOARD=y
+# CONFIG_MACH_CRANEBOARD is not set
 CONFIG_MACH_OMAP3_PANDORA=y
 CONFIG_MACH_TOUCHBOOK=y
 CONFIG_MACH_OMAP_3430SDP=y
@@ -235,15 +166,37 @@ CONFIG_MACH_CM_T3730=y
 CONFIG_MACH_SBC3530=y
 CONFIG_MACH_TI8168EVM=y
 CONFIG_MACH_TI8148EVM=y
-CONFIG_OMAP3_EMU=y
+# CONFIG_OMAP3_EMU is not set
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
-CONFIG_ARCH_PICOXCELL=y
+CONFIG_ARCH_QCOM=y
+
+#
+# Qualcomm SoC Selection
+#
+# CONFIG_ARCH_MSM8X60 is not set
+# CONFIG_ARCH_MSM8960 is not set
+# CONFIG_ARCH_MSM8974 is not set
+CONFIG_QCOM_SCM=y
 CONFIG_ARCH_ROCKCHIP=y
-CONFIG_ARCH_SOCFPGA=y
+# CONFIG_ARCH_SOCFPGA is not set
 CONFIG_ARCH_STI=y
 CONFIG_SOC_STIH415=y
 CONFIG_SOC_STIH416=y
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
+CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_MULTI=y
+
+#
+# Renesas ARM SoCs System Type
+#
+# CONFIG_ARCH_EMEV2 is not set
+# CONFIG_ARCH_R7S72100 is not set
+# CONFIG_ARCH_R8A7790 is not set
+# CONFIG_ARCH_R8A7791 is not set
+
+#
+# Timer and clock configuration
+#
+CONFIG_SHMOBILE_TIMER_HZ=128
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_SIRF=y
 
@@ -264,7 +217,6 @@ CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_TEGRA_AHB=y
-# CONFIG_TEGRA_EMC_SCALING_ENABLE is not set
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
 
@@ -272,10 +224,9 @@ CONFIG_UX500_SOC_DB8500=y
 # Ux500 target platform (boards)
 #
 CONFIG_MACH_MOP500=y
-CONFIG_MACH_HREFV60=y
-CONFIG_MACH_SNOWBALL=y
+# CONFIG_MACH_HREFV60 is not set
+# CONFIG_MACH_SNOWBALL is not set
 CONFIG_UX500_AUTO_PLATFORM=y
-CONFIG_MACH_UX500_DT=y
 CONFIG_UX500_DEBUG_UART=2
 CONFIG_ARCH_VEXPRESS=y
 
@@ -284,12 +235,12 @@ CONFIG_ARCH_VEXPRESS=y
 #
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
+CONFIG_ARCH_VEXPRESS_DCSCB=y
 CONFIG_ARCH_VEXPRESS_SPC=y
+CONFIG_ARCH_VEXPRESS_TC2_PM=y
 CONFIG_PLAT_VERSATILE_CLCD=y
 CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y
-CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_VT8500=y
-CONFIG_ARCH_WM8750=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_PLAT_VERSATILE=y
@@ -300,57 +251,53 @@ CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y
 #
 # Firmware options
 #
-# CONFIG_TRUSTED_FOUNDATIONS is not set
+CONFIG_TRUSTED_FOUNDATIONS=y
 
 #
 # Processor Type
 #
+CONFIG_CPU_PJ4=y
 CONFIG_CPU_PJ4B=y
-CONFIG_CPU_V6=y
-CONFIG_CPU_V6K=y
 CONFIG_CPU_V7=y
-CONFIG_CPU_32v6=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
-CONFIG_CPU_ABRT_EV6=y
 CONFIG_CPU_ABRT_EV7=y
-CONFIG_CPU_PABRT_V6=y
 CONFIG_CPU_PABRT_V7=y
-CONFIG_CPU_CACHE_V6=y
 CONFIG_CPU_CACHE_V7=y
 CONFIG_CPU_CACHE_VIPT=y
 CONFIG_CPU_COPY_V6=y
-CONFIG_CPU_TLB_V6=y
 CONFIG_CPU_TLB_V7=y
 CONFIG_CPU_HAS_ASID=y
 
 #
 # Processor Features
 #
-# CONFIG_ARM_THUMBEE is not set
+# CONFIG_ARM_LPAE is not set
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_VIRT_EXT=y
-CONFIG_SWP_EMULATE=y
+# CONFIG_SWP_EMULATE is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 # CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_DMA_CACHE_RWFO=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_CACHE_L2X0=y
+CONFIG_CACHE_PL310=y
+CONFIG_CACHE_TAUROS2=y
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
+CONFIG_IWMMXT=y
 CONFIG_PJ4B_ERRATA_4742=y
-# CONFIG_ARM_ERRATA_326103 is not set
-CONFIG_ARM_ERRATA_411920=y
-CONFIG_ARM_ERRATA_430973=y
+# CONFIG_ARM_ERRATA_430973 is not set
 CONFIG_PL310_ERRATA_588369=y
-CONFIG_ARM_ERRATA_643719=y
+# CONFIG_ARM_ERRATA_643719 is not set
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_PL310_ERRATA_727915=y
+CONFIG_PL310_ERRATA_753970=y
 CONFIG_ARM_ERRATA_754322=y
 CONFIG_ARM_ERRATA_754327=y
-CONFIG_ARM_ERRATA_364296=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_ERRATA_775420=y
@@ -371,7 +318,17 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_PCIE_DW=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_TEGRA=y
-# CONFIG_PCCARD is not set
+CONFIG_PCI_RCAR_GEN2=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
 
 #
 # Kernel Features
@@ -379,18 +336,25 @@ CONFIG_PCI_TEGRA=y
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
 CONFIG_ARM_CPU_TOPOLOGY=y
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-# CONFIG_MCPM is not set
-# CONFIG_BIG_LITTLE is not set
-CONFIG_NR_CPUS=8
+# CONFIG_SCHED_MC is not set
+# CONFIG_SCHED_SMT is not set
+CONFIG_MCPM=y
+CONFIG_BIG_LITTLE=y
+# CONFIG_BL_SWITCHER is not set
+CONFIG_NR_CPUS=4
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARCH_NR_GPIO=1024
+# CONFIG_THUMB2_KERNEL is not set
+CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
+CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_MMU_NOTIFIER=y
 CONFIG_FORCE_MAX_ZONEORDER=12
+# CONFIG_UACCESS_WITH_MEMCPY is not set
+CONFIG_XEN_DOM0=y
+CONFIG_XEN=y
 
 #
 # Boot options
@@ -399,13 +363,20 @@ CONFIG_FORCE_MAX_ZONEORDER=12
 CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
 
 #
-# CPU Frequency scaling
+# ARM CPU frequency scaling drivers
 #
-# CONFIG_CPU_FREQ is not set
+# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
+# CONFIG_ARM_IMX6Q_CPUFREQ is not set
+CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_TEGRA_CPUFREQ=y
 
 #
-# CPU Idle
+# ARM CPU Idle Drivers
 #
+# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
+# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
+# CONFIG_ARM_ZYNQ_CPUIDLE is not set
+# CONFIG_ARM_U8500_CPUIDLE is not set
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
@@ -430,126 +401,25 @@ CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NET_FLOW_LIMIT=y
 
-#
-# Bluetooth device drivers
-#
-# CONFIG_RFKILL_REGULATOR is not set
-
 #
 # Generic Driver Options
 #
-CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_SYS_HYPERVISOR=y
 CONFIG_SOC_BUS=y
-CONFIG_REGMAP_MMIO=y
 
 #
 # Bus devices
 #
-CONFIG_IMX_WEIM=y
-CONFIG_OMAP_OCP2SCP=m
+# CONFIG_IMX_WEIM is not set
+# CONFIG_OMAP_OCP2SCP is not set
 CONFIG_OMAP_INTERCONNECT=y
-CONFIG_MTD=y
-CONFIG_MTD_TESTS=m
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_OF_PARTS=y
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-CONFIG_SM_FTL=m
-# CONFIG_MTD_OOPS is not set
-# CONFIG_MTD_SWAP is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_RAM=m
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOCG3 is not set
-CONFIG_MTD_NAND_ECC=y
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_ECC_BCH is not set
-# CONFIG_MTD_SM_COMMON is not set
-# CONFIG_MTD_NAND_DENALI is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_OMAP2=y
-# CONFIG_MTD_NAND_OMAP_BCH is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_RICOH is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_DOCG4 is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_PXA3xx is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_MTD_NAND_ORION=m
-CONFIG_MTD_NAND_MXC=m
-# CONFIG_MTD_NAND_FSMC is not set
-CONFIG_MTD_ONENAND=y
-# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set
-# CONFIG_MTD_ONENAND_GENERIC is not set
-CONFIG_MTD_ONENAND_OMAP2=y
-# CONFIG_MTD_ONENAND_OTP is not set
-CONFIG_MTD_ONENAND_2X_PROGRAM=y
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-# CONFIG_MTD_UBI is not set
 
 #
 # Device Tree and Open Firmware support
 #
-CONFIG_OF_MTD=y
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_MG_DISK=m
-CONFIG_MG_DISK_RES=0
+CONFIG_XEN_BLKDEV_FRONTEND=y
+# CONFIG_XEN_BLKDEV_BACKEND is not set
+CONFIG_VIRTIO_BLK=m
 
 #
 # Misc devices
@@ -560,40 +430,45 @@ CONFIG_SRAM=y
 #
 # EEPROM support
 #
-CONFIG_EEPROM_SUNXI_SID=m
+# CONFIG_EEPROM_SUNXI_SID is not set
 
 #
 # Controllers with non-SFF native interface
 #
+CONFIG_AHCI_ST=m
 CONFIG_AHCI_IMX=m
+CONFIG_AHCI_SUNXI=m
 
 #
-# PATA SFF controllers with BMDMA
+# SATA SFF controllers with BMDMA
 #
-CONFIG_PATA_IMX=m
+CONFIG_SATA_HIGHBANK=m
+CONFIG_SATA_RCAR=m
 
 #
-# PIO-only SFF controllers
+# PATA SFF controllers with BMDMA
 #
-CONFIG_PATA_PLATFORM=m
-CONFIG_PATA_OF_PLATFORM=m
+CONFIG_PATA_IMX=m
 
 #
 # Distributed Switch Architecture drivers
 #
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
+# CONFIG_MACB is not set
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=m
-CONFIG_SFC_MTD=y
+# CONFIG_DWMAC_SOCFPGA is not set
 CONFIG_DWMAC_SUNXI=y
 CONFIG_DWMAC_STI=y
-# CONFIG_TI_DAVINCI_EMAC is not set
+CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=m
 CONFIG_TI_DAVINCI_CPDMA=m
-# CONFIG_TI_CPSW is not set
+CONFIG_TI_CPSW_PHY_SEL=y
+CONFIG_TI_CPSW=m
+# CONFIG_TI_CPTS is not set
 CONFIG_NET_VENDOR_XILINX=y
-CONFIG_XILINX_EMACLITE=m
+# CONFIG_XILINX_EMACLITE is not set
 
 #
 # MII PHY device drivers
@@ -601,83 +476,86 @@ CONFIG_XILINX_EMACLITE=m
 CONFIG_MDIO_SUN4I=m
 
 #
-# Input device support
+# USB Network Adapters
 #
-CONFIG_INPUT_FF_MEMLESS=y
-CONFIG_INPUT_MATRIXKMAP=y
+# CONFIG_B43_SDIO is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
 
 #
 # Input Device Drivers
 #
-# CONFIG_KEYBOARD_ADP5520 is not set
 CONFIG_KEYBOARD_IMX=m
 # CONFIG_KEYBOARD_NOMADIK is not set
 CONFIG_KEYBOARD_TEGRA=m
-CONFIG_KEYBOARD_SAMSUNG=y
-# CONFIG_KEYBOARD_STMPE is not set
+CONFIG_KEYBOARD_SH_KEYSC=m
 CONFIG_KEYBOARD_OMAP4=m
-# CONFIG_KEYBOARD_TC3589X is not set
-CONFIG_MOUSE_GPIO=m
 # CONFIG_INPUT_AB8500_PONKEY is not set
-CONFIG_INPUT_TWL4030_PWRBUTTON=y
-CONFIG_INPUT_TWL4030_VIBRA=y
-CONFIG_INPUT_TWL6040_VIBRA=y
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 CONFIG_INPUT_SIRFSOC_ONKEY=y
 
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO_AMBAKMI=m
+# CONFIG_SERIO_AMBAKMI is not set
 
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_AMBA_PL010=y
-# CONFIG_SERIAL_AMBA_PL010_CONSOLE is not set
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_SIRFSOC=y
-# CONFIG_SERIAL_SIRFSOC_CONSOLE is not set
-CONFIG_SERIAL_TEGRA=y
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_UARTLITE=y
-CONFIG_SERIAL_UARTLITE_CONSOLE=y
-CONFIG_SERIAL_MSM=y
-CONFIG_SERIAL_MSM_CONSOLE=y
-CONFIG_SERIAL_VT8500=y
-CONFIG_SERIAL_VT8500_CONSOLE=y
-CONFIG_SERIAL_OMAP=y
-CONFIG_SERIAL_OMAP_CONSOLE=y
-CONFIG_SERIAL_SCCNXP=y
-# CONFIG_SERIAL_SCCNXP_CONSOLE is not set
-CONFIG_SERIAL_ARC=y
-# CONFIG_SERIAL_ARC_CONSOLE is not set
-CONFIG_HW_RANDOM_BCM2835=y
-CONFIG_HW_RANDOM_OMAP=m
-CONFIG_HW_RANDOM_OMAP3_ROM=m
-CONFIG_HW_RANDOM_MXC_RNGA=m
+CONFIG_SERIAL_AMBA_PL010=m
+CONFIG_SERIAL_AMBA_PL011=m
+CONFIG_SERIAL_SIRFSOC=m
+CONFIG_SERIAL_IMX=m
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_SH_SCI=m
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
+# CONFIG_SERIAL_MSM is not set
+# CONFIG_SERIAL_VT8500 is not set
+CONFIG_SERIAL_OMAP=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_HW_RANDOM_OMAP=y
+CONFIG_HW_RANDOM_OMAP3_ROM=y
 CONFIG_HW_RANDOM_MSM=m
 
-#
-# Multiplexer I2C Chip support
-#
-CONFIG_I2C_ALGOBIT=y
-
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
-CONFIG_I2C_BCM2835=y
+# CONFIG_I2C_CADENCE is not set
 CONFIG_I2C_DAVINCI=m
-CONFIG_I2C_IMX=y
-CONFIG_I2C_MV64XXX=y
+CONFIG_I2C_IMX=m
 CONFIG_I2C_NOMADIK=y
 CONFIG_I2C_OMAP=y
-CONFIG_I2C_SIRF=y
+CONFIG_I2C_QUP=m
+CONFIG_I2C_RIIC=m
+CONFIG_I2C_SH_MOBILE=m
+CONFIG_I2C_SIRF=m
 CONFIG_I2C_ST=m
-CONFIG_I2C_TEGRA=y
+CONFIG_I2C_TEGRA=m
 CONFIG_I2C_VERSATILE=m
-CONFIG_I2C_WMT=y
+# CONFIG_I2C_WMT is not set
+CONFIG_I2C_RCAR=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_SPMI_MSM_PMIC_ARB=m
+
+#
+# PPS support
+#
+CONFIG_PPS=y
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
 
 #
 # Pin controllers
@@ -687,12 +565,7 @@ CONFIG_PINCTRL_AB8500=y
 CONFIG_PINCTRL_AB8540=y
 CONFIG_PINCTRL_AB9540=y
 CONFIG_PINCTRL_AB8505=y
-CONFIG_PINCTRL_BCM2835=y
 CONFIG_PINCTRL_IMX=y
-CONFIG_PINCTRL_IMX35=y
-CONFIG_PINCTRL_IMX50=y
-CONFIG_PINCTRL_IMX51=y
-CONFIG_PINCTRL_IMX53=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_IMX6SL=y
 CONFIG_PINCTRL_VF610=y
@@ -709,139 +582,90 @@ CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA114=y
 CONFIG_PINCTRL_TEGRA124=y
-# CONFIG_PINCTRL_PALMAS is not set
+CONFIG_PINCTRL_DOVE=y
 CONFIG_PINCTRL_ARMADA_370=y
+CONFIG_PINCTRL_ARMADA_375=y
+CONFIG_PINCTRL_ARMADA_38X=y
 CONFIG_PINCTRL_ARMADA_XP=y
-CONFIG_PINCTRL_WMT=y
-CONFIG_PINCTRL_WM8750=y
-CONFIG_PINCTRL_WM8850=y
+CONFIG_PINCTRL_SH_PFC=y
+CONFIG_GPIO_SH_PFC=y
+# CONFIG_PINCTRL_WM8850 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIOLIB_IRQCHIP=y
 
 #
 # Memory mapped GPIO drivers:
 #
 # CONFIG_GPIO_DAVINCI is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_MSM_V2 is not set
+CONFIG_GPIO_MSM_V2=m
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_XILINX is not set
 
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MC9S08DZ60=y
-CONFIG_GPIO_TWL4030=m
-CONFIG_GPIO_TWL6040=m
-
-#
-# SPI GPIO expanders:
-#
-# CONFIG_GPIO_MCP23S08 is not set
-
 #
 # 1-wire Bus Masters
 #
-CONFIG_W1_MASTER_MXC=m
+# CONFIG_W1_MASTER_MXC is not set
 # CONFIG_HDQ_MASTER_OMAP is not set
 
 #
 # 1-wire Slaves
 #
-# CONFIG_MAX8925_POWER is not set
-# CONFIG_WM831X_BACKUP is not set
-# CONFIG_WM831X_POWER is not set
-# CONFIG_WM8350_POWER is not set
-# CONFIG_BATTERY_88PM860X is not set
-# CONFIG_BATTERY_DA9030 is not set
-# CONFIG_BATTERY_DA9052 is not set
-# CONFIG_BATTERY_TWL4030_MADC is not set
-# CONFIG_BATTERY_RX51 is not set
-# 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_AB8500_BM is not set
-CONFIG_POWER_RESET_MSM=y
+# CONFIG_POWER_RESET_MSM is not set
 
 #
 # Native drivers
 #
-# CONFIG_SENSORS_DA9052_ADC is not set
-# CONFIG_SENSORS_DA9055 is not set
-# CONFIG_SENSORS_TWL4030_MADC is not set
-# CONFIG_SENSORS_WM831X is not set
-# CONFIG_SENSORS_WM8350 is not set
+CONFIG_RCAR_THERMAL=y
 CONFIG_DB8500_THERMAL=y
-CONFIG_ARMADA_THERMAL=m
+CONFIG_ARMADA_THERMAL=y
 
 #
 # Texas Instruments thermal drivers
 #
-CONFIG_TI_SOC_THERMAL=m
-CONFIG_OMAP4_THERMAL=y
-CONFIG_OMAP5_THERMAL=y
-CONFIG_DRA752_THERMAL=y
+# CONFIG_TI_SOC_THERMAL is not set
 
 #
 # Watchdog Device Drivers
 #
-# CONFIG_DA9052_WATCHDOG is not set
-# CONFIG_DA9055_WATCHDOG is not set
-# CONFIG_WM831X_WATCHDOG is not set
-# CONFIG_WM8350_WATCHDOG is not set
-# CONFIG_ARM_SP805_WATCHDOG is not set
-CONFIG_OMAP_WATCHDOG=y
+CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_OMAP_WATCHDOG=m
 CONFIG_DAVINCI_WATCHDOG=m
 CONFIG_SUNXI_WATCHDOG=m
-# CONFIG_TWL4030_WATCHDOG is not set
 CONFIG_IMX2_WDT=m
 CONFIG_UX500_WATCHDOG=y
-CONFIG_SIRFSOC_WATCHDOG=m
-CONFIG_BCM2835_WDT=m
-CONFIG_BCM_KONA_WDT=m
-# CONFIG_BCM_KONA_WDT_DEBUG is not set
+CONFIG_SIRFSOC_WATCHDOG=y
+CONFIG_TEGRA_WATCHDOG=m
+# CONFIG_XEN_WDT is not set
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB_SDIOHOST is not set
 
 #
 # Multifunction device drivers
 #
 CONFIG_ABX500_CORE=y
-CONFIG_AB3100_CORE=y
-CONFIG_AB3100_OTP=y
+# CONFIG_AB3100_CORE is not set
 CONFIG_AB8500_CORE=y
-# CONFIG_AB8500_DEBUG is not set
-CONFIG_AB8500_GPADC=y
 CONFIG_MFD_DB8500_PRCMU=y
 
 #
 # STMicroelectronics STMPE Interface Drivers
 #
-CONFIG_MFD_SYSCON=y
 CONFIG_MFD_OMAP_USB_HOST=y
+# CONFIG_MFD_VX855 is not set
 CONFIG_REGULATOR_88PM8607=y
-CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_ANATOP=m
-CONFIG_REGULATOR_AB3100=y
-CONFIG_REGULATOR_AB8500=y
+# CONFIG_REGULATOR_AB8500 is not set
 CONFIG_REGULATOR_DBX500_PRCMU=y
 CONFIG_REGULATOR_DB8500_PRCMU=y
-CONFIG_REGULATOR_FAN53555=m
 CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_ISL6271A=m
-CONFIG_REGULATOR_LP3971=m
-CONFIG_REGULATOR_LP3972=m
 CONFIG_REGULATOR_LP872X=y
 CONFIG_REGULATOR_LP8788=y
-CONFIG_REGULATOR_MAX1586=m
-CONFIG_REGULATOR_MAX8649=m
-CONFIG_REGULATOR_MAX8660=m
-CONFIG_REGULATOR_MAX8952=m
-CONFIG_REGULATOR_MAX8973=m
-CONFIG_REGULATOR_TI_ABB=y
-CONFIG_REGULATOR_TPS51632=m
-CONFIG_REGULATOR_TPS62360=m
-CONFIG_REGULATOR_TPS65023=m
-CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_PBIAS=m
+CONFIG_REGULATOR_ST_PWM=m
+CONFIG_REGULATOR_TI_ABB=m
 CONFIG_REGULATOR_TWL4030=y
 
 #
@@ -852,40 +676,58 @@ CONFIG_REGULATOR_TWL4030=y
 #
 # Media digital TV PCI Adapters
 #
+# CONFIG_VIDEO_CAFE_CCIC is not set
 # CONFIG_VIDEO_DM6446_CCDC is not set
-CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
-CONFIG_VIDEO_OMAP2_VOUT=m
-CONFIG_VIDEO_MX3=m
-CONFIG_VIDEO_CODA=m
-CONFIG_VIDEO_TI_VPE=m
-# CONFIG_VIDEO_TI_VPE_DEBUG is not set
+# CONFIG_VIDEO_OMAP2_VOUT is not set
+# CONFIG_VIDEO_SH_VOU is not set
+# CONFIG_VIDEO_MX3 is not set
+# CONFIG_VIDEO_CODA is not set
+# CONFIG_VIDEO_TI_VPE is not set
 
 #
 # Graphics support
 #
 CONFIG_TEGRA_HOST1X=y
-# CONFIG_TEGRA_HOST1X_FIREWALL is not set
-CONFIG_DRM=y
+CONFIG_TEGRA_HOST1X_FIREWALL=y
+
+#
+# Direct Rendering Manager
+#
+CONFIG_DRM_MIPI_DSI=y
 
 #
 # I2C encoder or helper chips
 #
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
 CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_DMABUF=y
+CONFIG_DRM_EXYNOS_DPI=y
+CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_HDMI=y
 CONFIG_DRM_EXYNOS_VIDI=y
 CONFIG_DRM_EXYNOS_G2D=y
 CONFIG_DRM_EXYNOS_IPP=y
-CONFIG_DRM_EXYNOS_FIMC=y
-CONFIG_DRM_EXYNOS_ROTATOR=y
-# CONFIG_DRM_UDL is not set
-CONFIG_DRM_OMAP=m
-CONFIG_DRM_OMAP_NUM_CRTCS=1
-# CONFIG_DRM_MSM is not set
-# CONFIG_DRM_TEGRA is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-CONFIG_VIDEOMODE_HELPERS=y
-CONFIG_FB_MODE_HELPERS=y
+# CONFIG_DRM_EXYNOS_FIMC is not set
+# CONFIG_DRM_EXYNOS_ROTATOR is not set
+CONFIG_DRM_TEGRA=m
+CONFIG_DRM_TEGRA_FBDEV=y
+# CONFIG_DRM_TEGRA_DEBUG is not set
+# CONFIG_DRM_TEGRA_STAGING is not set
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_SIMPLE is not set
+# CONFIG_DRM_PANEL_LD9040 is not set
+# CONFIG_DRM_PANEL_S6E8AA0 is not set
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_SYS_FOPS=y
 
 #
 # Frame buffer hardware drivers
@@ -894,125 +736,72 @@ CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_IMX is not set
 # CONFIG_FB_VT8500 is not set
 # CONFIG_FB_WM8505 is not set
+# CONFIG_FB_SH_MOBILE_LCDC is not set
 # CONFIG_FB_XILINX is not set
 # CONFIG_FB_DA8XX is not set
-# CONFIG_FB_MSM is not set
+CONFIG_XEN_FBDEV_FRONTEND=y
 # CONFIG_FB_MX3 is not set
-CONFIG_OMAP2_VRFB=y
-CONFIG_OMAP2_DSS=y
-# CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_OMAP2_DSS_DEBUGFS is not set
-CONFIG_OMAP2_DSS_DPI=y
-CONFIG_OMAP2_DSS_VENC=y
-CONFIG_OMAP4_DSS_HDMI=y
-CONFIG_OMAP4_DSS_HDMI_AUDIO=y
-# CONFIG_OMAP2_DSS_SDI is not set
-# CONFIG_OMAP2_DSS_DSI is not set
-CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1
-CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
-# CONFIG_FB_OMAP2 is not set
-
-#
-# OMAP Display Device Drivers (new device model)
-#
-CONFIG_DISPLAY_ENCODER_TFP410=m
-CONFIG_DISPLAY_ENCODER_TPD12S015=m
-CONFIG_DISPLAY_CONNECTOR_DVI=m
-CONFIG_DISPLAY_CONNECTOR_HDMI=m
-CONFIG_DISPLAY_CONNECTOR_ANALOG_TV=m
-CONFIG_DISPLAY_PANEL_DPI=m
-CONFIG_DISPLAY_PANEL_DSI_CM=m
-CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01=m
+# CONFIG_OMAP2_DSS is not set
+# CONFIG_FB_SH_MOBILE_MERAM is not set
 # CONFIG_LCD_PLATFORM is not set
+CONFIG_VIDEOMODE_HELPERS=y
 
 #
 # Console display driver support
 #
 CONFIG_SND_DMAENGINE_PCM=m
+# CONFIG_SND_ES1968_INPUT is not set
+# CONFIG_SND_MAESTRO3_INPUT is not set
+
+#
+# HD-Audio
+#
 CONFIG_SND_ARMAACI=m
-CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_ADI=m
-CONFIG_SND_SOC_ADI_AXI_I2S=m
-CONFIG_SND_SOC_ADI_AXI_SPDIF=m
-CONFIG_SND_BCM2835_SOC_I2S=m
+# CONFIG_SND_SOC_ADI is not set
 CONFIG_SND_DAVINCI_SOC=m
 CONFIG_SND_DAVINCI_SOC_MCASP=m
 CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
 CONFIG_SND_AM33XX_SOC_EVM=m
 CONFIG_SND_SOC_FSL_SSI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_IMX_SOC=m
 CONFIG_SND_SOC_IMX_SSI=m
-CONFIG_SND_SOC_IMX_PCM_FIQ=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
-CONFIG_SND_SOC_PHYCORE_AC97=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
 CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
-CONFIG_SND_OMAP_SOC=m
-CONFIG_SND_OMAP_SOC_DMIC=m
-CONFIG_SND_OMAP_SOC_MCBSP=m
-CONFIG_SND_OMAP_SOC_MCPDM=m
-CONFIG_SND_OMAP_SOC_HDMI=m
-CONFIG_SND_OMAP_SOC_RX51=m
-CONFIG_SND_OMAP_SOC_AM3517EVM=m
-CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
-CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
-CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
-CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
-CONFIG_SND_SOC_TEGRA=m
-CONFIG_SND_SOC_TEGRA20_AC97=m
-CONFIG_SND_SOC_TEGRA20_DAS=m
-CONFIG_SND_SOC_TEGRA20_I2S=m
-CONFIG_SND_SOC_TEGRA20_SPDIF=m
-CONFIG_SND_SOC_TEGRA30_AHUB=m
-CONFIG_SND_SOC_TEGRA30_I2S=m
-CONFIG_SND_SOC_TEGRA_RT5640=m
-CONFIG_SND_SOC_TEGRA_WM8753=m
-CONFIG_SND_SOC_TEGRA_WM8903=m
-CONFIG_SND_SOC_TEGRA_WM9712=m
-CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
-CONFIG_SND_SOC_TEGRA_ALC5632=m
-CONFIG_SND_SOC_TEGRA_MAX98090=m
-CONFIG_SND_SOC_UX500=m
-# CONFIG_SND_SOC_UX500_PLAT_DMA is not set
-# CONFIG_SND_SOC_UX500_MACH_MOP500 is not set
-CONFIG_SND_SOC_ALC5632=m
-CONFIG_SND_SOC_DMIC=m
-CONFIG_SND_SOC_MAX98090=m
-CONFIG_SND_SOC_HDMI_CODEC=m
-CONFIG_SND_SOC_RT5640=m
-CONFIG_SND_SOC_SGTL5000=m
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TLV320AIC3X=m
-CONFIG_SND_SOC_TWL4030=m
-CONFIG_SND_SOC_TWL6040=m
-CONFIG_SND_SOC_WM8753=m
-CONFIG_SND_SOC_WM8903=m
-CONFIG_SND_SOC_WM8962=m
-CONFIG_SND_SOC_WM9712=m
-CONFIG_SND_SOC_TPA6130A2=m
+CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 
 #
-# I2C HID support
+# SoC Audio support for SuperH
 #
-CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_SND_SOC_SH4_FSI=m
+CONFIG_SND_SOC_RCAR=m
+CONFIG_SND_SOC_SIRF=m
+CONFIG_SND_SOC_SIRF_AUDIO=m
+CONFIG_SND_SOC_SIRF_AUDIO_PORT=m
+# CONFIG_SND_SOC_UX500 is not set
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
 
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_MXC=m
+CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_EHCI_HCD_OMAP=y
-CONFIG_USB_EHCI_HCD_ORION=m
-CONFIG_USB_EHCI_MSM=m
 CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
 CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y
 CONFIG_USB_UHCI_PLATFORM=y
-CONFIG_USB_IMX21_HCD=m
+CONFIG_USB_IMX21_HCD=y
 
 #
 # USB Imaging devices
@@ -1026,16 +815,9 @@ CONFIG_USB_MUSB_AM35X=m
 #
 # USB Physical Layer drivers
 #
-CONFIG_AB8500_USB=m
+# CONFIG_AB8500_USB is not set
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_NOP_USB_XCEIV=y
-CONFIG_OMAP_CONTROL_USB=m
-CONFIG_OMAP_USB3=m
-CONFIG_SAMSUNG_USBPHY=y
-CONFIG_SAMSUNG_USB2PHY=y
-CONFIG_SAMSUNG_USB3PHY=y
-CONFIG_TWL6030_USB=m
-CONFIG_USB_MSM_OTG=m
 CONFIG_USB_MXS_PHY=m
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_MMC=y
@@ -1049,68 +831,28 @@ CONFIG_MMC_BLOCK=y
 # MMC/SD/SDIO Host Controller Drivers
 #
 CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+# CONFIG_MMC_RICOH_MMC is not set
 CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_TEGRA=m
 CONFIG_MMC_SDHCI_SIRF=m
-CONFIG_MMC_SDHCI_BCM_KONA=m
-CONFIG_MMC_SDHCI_BCM2835=m
-CONFIG_MMC_OMAP=y
-CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_OMAP=m
+CONFIG_MMC_OMAP_HS=m
+CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_MXC=m
-# CONFIG_MMC_DW_SOCFPGA is not set
-CONFIG_MMC_WMT=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_LEDS_GPIO_REGISTER=y
+CONFIG_MMC_TMIO_CORE=m
+CONFIG_MMC_SDHI=m
+CONFIG_MMC_SH_MMCIF=m
+CONFIG_MMC_WMT=y
 
 #
 # LED drivers
 #
-# CONFIG_LEDS_88PM860X is not set
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEDS_LP8788 is not set
-# CONFIG_LEDS_WM831X_STATUS is not set
-# CONFIG_LEDS_WM8350 is not set
-# CONFIG_LEDS_DA903X is not set
-# CONFIG_LEDS_DA9052 is not set
-# CONFIG_LEDS_ADP5520 is not set
-# CONFIG_LEDS_MAX8997 is not set
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-
-#
-# I2C RTC drivers
-#
-# CONFIG_RTC_DRV_88PM860X is not set
-# CONFIG_RTC_DRV_88PM80X is not set
-# CONFIG_RTC_DRV_LP8788 is not set
-# CONFIG_RTC_DRV_MAX8907 is not set
-# CONFIG_RTC_DRV_MAX8925 is not set
-# CONFIG_RTC_DRV_MAX8998 is not set
-# CONFIG_RTC_DRV_MAX8997 is not set
-# CONFIG_RTC_DRV_MAX77686 is not set
-# CONFIG_RTC_DRV_PALMAS is not set
-# CONFIG_RTC_DRV_TWL4030 is not set
-# CONFIG_RTC_DRV_TPS6586X is not set
-# CONFIG_RTC_DRV_TPS65910 is not set
-# CONFIG_RTC_DRV_TPS80031 is not set
-# CONFIG_RTC_DRV_RC5T583 is not set
+# CONFIG_LEDS_PWM is not set
 
 #
 # Platform RTC drivers
 #
-# CONFIG_RTC_DRV_DA9052 is not set
-# CONFIG_RTC_DRV_DA9055 is not set
-# CONFIG_RTC_DRV_WM831X is not set
-# CONFIG_RTC_DRV_WM8350 is not set
-CONFIG_RTC_DRV_AB3100=y
 # CONFIG_RTC_DRV_AB8500 is not set
 
 #
@@ -1120,7 +862,7 @@ CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_OMAP=m
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
-CONFIG_RTC_DRV_VT8500=m
+# CONFIG_RTC_DRV_VT8500 is not set
 CONFIG_RTC_DRV_SUNXI=m
 CONFIG_RTC_DRV_TEGRA=m
 CONFIG_RTC_DRV_MXC=m
@@ -1130,26 +872,57 @@ CONFIG_RTC_DRV_SIRFSOC=m
 # DMA Devices
 #
 # CONFIG_AMBA_PL08X is not set
+# CONFIG_DW_DMAC_PCI is not set
+# CONFIG_MV_XOR is not set
 CONFIG_MX3_IPU=y
 CONFIG_MX3_IPU_IRQS=4
-CONFIG_TEGRA20_APB_DMA=y
+# CONFIG_TEGRA20_APB_DMA is not set
+CONFIG_SH_DMAE_BASE=y
+# CONFIG_SH_DMAE is not set
+# CONFIG_SUDMAC is not set
+# CONFIG_RCAR_HPB_DMAE is not set
+# CONFIG_RCAR_AUDMAC_PP is not set
 # CONFIG_STE_DMA40 is not set
-CONFIG_SIRF_DMA=y
-CONFIG_TI_EDMA=y
-CONFIG_PL330_DMA=y
-CONFIG_IMX_SDMA=m
-CONFIG_IMX_DMA=m
+# CONFIG_SIRF_DMA is not set
+# CONFIG_TI_EDMA is not set
+# CONFIG_PL330_DMA is not set
+# CONFIG_IMX_SDMA is not set
+# CONFIG_IMX_DMA is not set
 # CONFIG_MXS_DMA is not set
-CONFIG_DMA_OMAP=y
-CONFIG_DMA_BCM2835=m
-CONFIG_TI_CPPI41=m
-CONFIG_K3_DMA=m
-CONFIG_DMA_VIRTUAL_CHANNELS=y
+# CONFIG_DMA_OMAP is not set
+# CONFIG_TI_CPPI41 is not set
+# CONFIG_K3_DMA is not set
 
 #
 # DMA Clients
 #
-# CONFIG_VFIO is not set
+# CONFIG_QCOM_BAM_DMA is not set
+# 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
+CONFIG_VIRTIO=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DEV_EVTCHN=y
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=y
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PRIVCMD=y
 
 #
 # Speakup console speech
@@ -1159,26 +932,31 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y
 #
 # Android
 #
+# CONFIG_SBYPASS is not set
+# CONFIG_BPCTL is not set
 # CONFIG_DRM_IMX is not set
+# CONFIG_BT_NOKIA_H4P is not set
 
 #
 # Common Clock Framework
 #
-# CONFIG_COMMON_CLK_WM831X is not set
+CONFIG_COMMON_CLK_WM831X=y
 CONFIG_COMMON_CLK_VERSATILE=y
-# CONFIG_COMMON_CLK_MAX77686 is not set
-CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_COMMON_CLK_MAX77686=y
+# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 CONFIG_COMMON_CLK_KEYSTONE=y
 CONFIG_MVEBU_CLK_CPU=y
 CONFIG_MVEBU_CLK_COREDIV=y
 CONFIG_ARMADA_370_CLK=y
+CONFIG_ARMADA_375_CLK=y
+CONFIG_ARMADA_38X_CLK=y
 CONFIG_ARMADA_XP_CLK=y
-CONFIG_HWSPINLOCK=m
+CONFIG_DOVE_CLK=y
 
 #
 # Hardware Spinlock drivers
 #
-CONFIG_HWSPINLOCK_OMAP=m
+# CONFIG_HWSPINLOCK_OMAP is not set
 # CONFIG_HSEM_U8500 is not set
 CONFIG_DW_APB_TIMER=y
 CONFIG_DW_APB_TIMER_OF=y
@@ -1196,20 +974,17 @@ CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_VF_PIT_TIMER=y
 CONFIG_PL320_MBOX=y
-CONFIG_OMAP_MBOX=m
-CONFIG_OMAP2PLUS_MBOX=m
-CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-CONFIG_IOMMU_API=y
-CONFIG_MSM_IOMMU=y
-CONFIG_IOMMU_PGTABLES_L2=y
+# CONFIG_OMAP2PLUS_MBOX is not set
 # CONFIG_OMAP_IOMMU is not set
 # CONFIG_TEGRA_IOMMU_GART is not set
 # CONFIG_TEGRA_IOMMU_SMMU is not set
+# CONFIG_SHMOBILE_IOMMU is not set
 
 #
 # Rpmsg drivers
 #
-CONFIG_TI_EMIF=m
+# CONFIG_TI_AEMIF is not set
+# CONFIG_TI_EMIF is not set
 CONFIG_TEGRA20_MC=y
 CONFIG_TEGRA30_MC=y
 
@@ -1218,33 +993,43 @@ CONFIG_TEGRA30_MC=y
 #
 # CONFIG_LP8788_ADC is not set
 # CONFIG_TWL6030_GPADC is not set
+# CONFIG_XILINX_XADC is not set
 
 #
 # Temperature sensors
 #
-# CONFIG_PWM is not set
+# CONFIG_PWM_AB8500 is not set
+# CONFIG_PWM_FSL_FTM is not set
+# CONFIG_PWM_IMX is not set
+# CONFIG_PWM_LP3943 is not set
+# CONFIG_PWM_PCA9685 is not set
+# CONFIG_PWM_RENESAS_TPU is not set
+# CONFIG_PWM_TEGRA is not set
+# CONFIG_PWM_TIECAP is not set
+# CONFIG_PWM_TIEHRPWM is not set
+# CONFIG_PWM_TWL is not set
+# CONFIG_PWM_TWL_LED is not set
+# CONFIG_PWM_VT8500 is not set
 CONFIG_ARM_GIC=y
-CONFIG_ARM_VIC=y
-CONFIG_ARM_VIC_NR=2
 CONFIG_DW_APB_ICTL=y
+CONFIG_IRQ_CROSSBAR=y
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
+CONFIG_STI_RESET_SYSCFG=y
+CONFIG_STIH415_RESET=y
+CONFIG_STIH416_RESET=y
 
 #
 # PHY Subsystem
 #
-CONFIG_OMAP_USB2=m
+CONFIG_OMAP_CONTROL_PHY=m
 CONFIG_TWL4030_USB=m
+CONFIG_PHY_SUN4I_USB=m
 
 #
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
 
-#
-# Pseudo filesystems
-#
-# CONFIG_JFFS2_FS is not set
-
 #
 # Memory Debugging
 #
@@ -1253,7 +1038,7 @@ CONFIG_DCACHE_WORD_ACCESS=y
 #
 # RCU Debugging
 #
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_CPU_STALL_INFO is not set
 
 #
@@ -1263,7 +1048,7 @@ CONFIG_DEBUG_IMX_UART_PORT=1
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 # CONFIG_DEBUG_UART_8250 is not set
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
-CONFIG_OC_ETM=y
+# CONFIG_OC_ETM is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
 #
@@ -1274,14 +1059,11 @@ CONFIG_PAX_PAGEEXEC=y
 CONFIG_PAX_MPROTECT=y
 # CONFIG_PAX_MPROTECT_COMPAT is not set
 CONFIG_PAX_ELFRELOCS=y
-CONFIG_PAX_KERNEXEC=y
 
 #
 # Miscellaneous hardening features
 #
-CONFIG_PAX_MEMORY_UDEREF=y
 CONFIG_PAX_REFCOUNT=y
-CONFIG_PAX_CONSTIFY_PLUGIN=y
 
 #
 # Memory Protections
@@ -1296,7 +1078,7 @@ CONFIG_GRKERNSEC_RWXMAP_LOG=y
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_PCRYPT=m
+# CONFIG_CRYPTO_PCRYPT is not set
 CONFIG_CRYPTO_ABLK_HELPER=m
 
 #
@@ -1309,12 +1091,9 @@ CONFIG_CRYPTO_AES_ARM_BS=m
 #
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
-CONFIG_CRYPTO_DEV_PICOXCELL=m
+CONFIG_CRYPTO_DEV_OMAP_DES=m
 CONFIG_CRYPTO_DEV_SAHARA=m
-CONFIG_CRYPTO_DEV_TEGRA_AES=m
-CONFIG_CRYPTO_DEV_UX500=m
-# CONFIG_CRYPTO_DEV_UX500_CRYP is not set
-# CONFIG_CRYPTO_DEV_UX500_HASH is not set
+# CONFIG_CRYPTO_DEV_UX500 is not set
 
 #
 # Library routines