]> git.ipfire.org Git - ipfire-3.x.git/blobdiff - kernel/config-armv7hl-default
kernel: Update to 3.17
[ipfire-3.x.git] / kernel / config-armv7hl-default
index 4b5562ef1174fe62799d42daf2d8812dfd59f564..91a94c7fc0b2ad060540a185fa76f72c03b2ddb3 100644 (file)
@@ -1,16 +1,12 @@
-CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
-CONFIG_MIGHT_HAVE_PCI=y
 CONFIG_NO_IOPORT_MAP=y
 CONFIG_ARCH_HAS_BANDGAP=y
-CONFIG_FIQ=y
 
 #
 # IRQ subsystem
 #
-CONFIG_SPARSE_IRQ=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 
@@ -51,16 +47,9 @@ CONFIG_SLUB_CPU_PARTIAL=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 
-#
-# System Type
-#
-CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_KIRKWOOD is not set
-
 #
 # CPU Core family selection
 #
-# 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
@@ -69,27 +58,33 @@ CONFIG_ARCH_VIRT=y
 CONFIG_ARCH_BCM=y
 # CONFIG_ARCH_BCM_MOBILE is not set
 CONFIG_ARCH_BCM_5301X=y
+CONFIG_ARCH_BRCMSTB=y
 CONFIG_ARCH_BERLIN=y
 # CONFIG_MACH_BERLIN_BG2 is not set
 # CONFIG_MACH_BERLIN_BG2CD is not set
 # CONFIG_MACH_BERLIN_BG2Q is not set
 CONFIG_ARCH_HIGHBANK=y
+
+#
+# Hisilicon platform type
+#
 CONFIG_ARCH_HI3xxx=y
+CONFIG_ARCH_HIX5HD2=y
 CONFIG_ARCH_KEYSTONE=y
-CONFIG_ARCH_MXC=y
-# CONFIG_MXC_DEBUG_BOARD is not set
 
 #
 # Device tree only
 #
 # CONFIG_SOC_IMX50 is not set
-# CONFIG_MACH_IMX51_DT is not set
+# CONFIG_SOC_IMX51 is not set
 # CONFIG_SOC_IMX53 is not set
 CONFIG_SOC_IMX6=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_VF610=y
+CONFIG_ARCH_MEDIATEK=y
+CONFIG_ARCH_OMAP=y
 
 #
 # OMAP Feature Selections
@@ -108,7 +103,6 @@ CONFIG_MACH_OMAP_GENERIC=y
 #
 # TI OMAP/AM/DM/DRA Family
 #
-CONFIG_ARCH_OMAP=y
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
 CONFIG_SOC_OMAP5=y
@@ -161,6 +155,7 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_STI=y
 CONFIG_SOC_STIH415=y
 CONFIG_SOC_STIH416=y
+# CONFIG_ARCH_S5PV210 is not set
 CONFIG_ARCH_EXYNOS=y
 # CONFIG_ARCH_EXYNOS3 is not set
 CONFIG_ARCH_EXYNOS4=y
@@ -194,9 +189,15 @@ CONFIG_ARCH_SHMOBILE=y
 CONFIG_ARCH_SHMOBILE_MULTI=y
 # CONFIG_ARCH_EMEV2 is not set
 # CONFIG_ARCH_R7S72100 is not set
+CONFIG_ARCH_R8A7779=y
 # CONFIG_ARCH_R8A7790 is not set
 # CONFIG_ARCH_R8A7791 is not set
 
+#
+# Renesas ARM SoCs Board Type
+#
+CONFIG_MACH_MARZEN=y
+
 #
 # Timer and clock configuration
 #
@@ -206,6 +207,7 @@ CONFIG_MACH_SUN4I=y
 CONFIG_MACH_SUN5I=y
 CONFIG_MACH_SUN6I=y
 CONFIG_MACH_SUN7I=y
+CONFIG_MACH_SUN8I=y
 CONFIG_ARCH_SIRF=y
 
 #
@@ -234,13 +236,11 @@ 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_VT8500=y
 CONFIG_ARCH_WM8850=y
 CONFIG_ARCH_ZYNQ=y
 CONFIG_PLAT_VERSATILE=y
-CONFIG_ARM_TIMER_SP804=y
 CONFIG_ARCH_SUPPORTS_FIRMWARE=y
 CONFIG_ARCH_SUPPORTS_TRUSTED_FOUNDATIONS=y
 
@@ -268,10 +268,9 @@ CONFIG_CPU_HAS_ASID=y
 #
 # CONFIG_ARM_LPAE is not set
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
-CONFIG_ARM_THUMBEE=y
+# CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_VIRT_EXT=y
-# CONFIG_SWP_EMULATE is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_SWP_EMULATE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
@@ -284,7 +283,6 @@ CONFIG_PL310_ERRATA_769419=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_ARM_ERRATA_430973 is not set
 # CONFIG_ARM_ERRATA_643719 is not set
 CONFIG_ARM_ERRATA_720789=y
@@ -300,7 +298,6 @@ CONFIG_TI_PRIV_EDMA=y
 #
 # Bus support
 #
-CONFIG_ARM_AMBA=y
 CONFIG_PCI_DOMAINS=y
 
 #
@@ -367,7 +364,6 @@ CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
 CONFIG_ARM_EXYNOS5250_CPUFREQ=y
 CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 # CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW is not set
-CONFIG_ARM_IMX6Q_CPUFREQ=m
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_ARM_TEGRA_CPUFREQ=y
@@ -393,8 +389,6 @@ CONFIG_KERNEL_MODE_NEON=y
 # Power management options
 #
 CONFIG_PM_SLEEP_SMP=y
-CONFIG_ARCH_HAS_OPP=y
-CONFIG_PM_OPP=y
 CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
 CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
@@ -411,7 +405,6 @@ CONFIG_NET_FLOW_LIMIT=y
 # Generic Driver Options
 #
 CONFIG_SYS_HYPERVISOR=y
-CONFIG_SOC_BUS=y
 
 #
 # Bus devices
@@ -432,7 +425,6 @@ CONFIG_VIRTIO_BLK=m
 # Misc devices
 #
 # CONFIG_ARM_CHARLCD is not set
-CONFIG_SRAM=y
 
 #
 # EEPROM support
@@ -443,8 +435,8 @@ CONFIG_SRAM=y
 # Controllers with non-SFF native interface
 #
 CONFIG_AHCI_ST=m
-CONFIG_AHCI_IMX=m
 CONFIG_AHCI_SUNXI=m
+CONFIG_AHCI_TEGRA=m
 
 #
 # SATA SFF controllers with BMDMA
@@ -452,19 +444,14 @@ CONFIG_AHCI_SUNXI=m
 CONFIG_SATA_HIGHBANK=m
 CONFIG_SATA_RCAR=m
 
-#
-# PATA SFF controllers with BMDMA
-#
-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_NET_CALXEDA_XGMAC=m
+CONFIG_SH_ETH=m
 CONFIG_DWMAC_SUNXI=y
 CONFIG_DWMAC_STI=y
 CONFIG_TI_DAVINCI_EMAC=m
@@ -480,10 +467,6 @@ CONFIG_NET_VENDOR_XILINX=y
 # MII PHY device drivers
 #
 CONFIG_MDIO_SUN4I=m
-
-#
-# USB Network Adapters
-#
 # CONFIG_B43_SDIO is not set
 
 #
@@ -500,7 +483,6 @@ CONFIG_INPUT_MATRIXKMAP=y
 #
 # Input Device Drivers
 #
-CONFIG_KEYBOARD_IMX=m
 # CONFIG_KEYBOARD_NOMADIK is not set
 CONFIG_KEYBOARD_TEGRA=m
 CONFIG_KEYBOARD_SAMSUNG=y
@@ -518,13 +500,10 @@ CONFIG_INPUT_SIRFSOC_ONKEY=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_AMBA_PL010=m
-CONFIG_SERIAL_AMBA_PL011=m
 CONFIG_SERIAL_SAMSUNG=m
 CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 CONFIG_SERIAL_SAMSUNG_UARTS=4
 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
@@ -546,7 +525,6 @@ CONFIG_HW_RANDOM_MSM=m
 # CONFIG_I2C_CADENCE is not set
 CONFIG_I2C_DAVINCI=m
 CONFIG_I2C_EXYNOS5=m
-CONFIG_I2C_IMX=m
 CONFIG_I2C_NOMADIK=y
 CONFIG_I2C_OMAP=y
 CONFIG_I2C_QUP=m
@@ -585,21 +563,12 @@ CONFIG_PTP_1588_CLOCK=y
 #
 # Pin controllers
 #
-CONFIG_PINCTRL_ABX500=y
-CONFIG_PINCTRL_AB8500=y
-CONFIG_PINCTRL_AB8540=y
-CONFIG_PINCTRL_AB9540=y
-CONFIG_PINCTRL_AB8505=y
+CONFIG_GENERIC_PINCONF=y
 CONFIG_PINCTRL_IMX=y
 CONFIG_PINCTRL_IMX6Q=y
 CONFIG_PINCTRL_IMX6SL=y
 CONFIG_PINCTRL_IMX6SX=y
 CONFIG_PINCTRL_VF610=y
-CONFIG_PINCTRL_APQ8064=y
-CONFIG_PINCTRL_MSM8X74=m
-CONFIG_PINCTRL_NOMADIK=y
-CONFIG_PINCTRL_DB8500=y
-CONFIG_PINCTRL_DB8540=y
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
 CONFIG_PINCTRL_SIRF=y
@@ -609,12 +578,26 @@ CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA114=y
 CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
+CONFIG_PINCTRL_ABX500=y
+CONFIG_PINCTRL_AB8500=y
+CONFIG_PINCTRL_AB8540=y
+CONFIG_PINCTRL_AB9540=y
+CONFIG_PINCTRL_AB8505=y
+CONFIG_PINCTRL_NOMADIK=y
+CONFIG_PINCTRL_DB8500=y
+CONFIG_PINCTRL_DB8540=y
+CONFIG_PINCTRL_MSM=y
+CONFIG_PINCTRL_APQ8064=y
+CONFIG_PINCTRL_IPQ8064=y
+CONFIG_PINCTRL_MSM8960=m
+CONFIG_PINCTRL_MSM8X74=m
 CONFIG_PINCTRL_SAMSUNG=y
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
 CONFIG_PINCTRL_SH_PFC=y
 CONFIG_GPIO_SH_PFC=y
-CONFIG_PINCTRL_SUNXI=y
+CONFIG_PINCTRL_PFC_R8A7779=y
 CONFIG_PINCTRL_SUNXI_COMMON=y
 CONFIG_PINCTRL_SUN4I_A10=y
 CONFIG_PINCTRL_SUN5I_A10S=y
@@ -622,19 +605,20 @@ CONFIG_PINCTRL_SUN5I_A13=y
 CONFIG_PINCTRL_SUN6I_A31=y
 CONFIG_PINCTRL_SUN6I_A31_R=y
 CONFIG_PINCTRL_SUN7I_A20=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
 # CONFIG_PINCTRL_WM8850 is not set
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 
 #
 # Memory mapped GPIO drivers:
 #
 # CONFIG_GPIO_DAVINCI is not set
 CONFIG_GPIO_MSM_V2=m
-CONFIG_GPIO_MXC=y
 CONFIG_GPIO_OMAP=y
 CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_RCAR is not set
 # CONFIG_GPIO_XILINX is not set
+CONFIG_GPIO_ZYNQ=m
 
 #
 # 1-wire Bus Masters
@@ -645,6 +629,7 @@ CONFIG_GPIO_PL061=y
 #
 # 1-wire Slaves
 #
+CONFIG_POWER_RESET_BRCMSTB=y
 # CONFIG_POWER_RESET_MSM is not set
 CONFIG_POWER_RESET_SUN6I=y
 CONFIG_POWER_RESET_KEYSTONE=y
@@ -666,15 +651,20 @@ CONFIG_DB8500_THERMAL=y
 CONFIG_EXYNOS_THERMAL=m
 CONFIG_EXYNOS_THERMAL_CORE=y
 
+#
+# STMicroelectronics thermal drivers
+#
+CONFIG_ST_THERMAL=m
+CONFIG_ST_THERMAL_SYSCFG=m
+CONFIG_ST_THERMAL_MEMMAP=m
+
 #
 # Watchdog Device Drivers
 #
-CONFIG_ARM_SP805_WATCHDOG=m
 CONFIG_S3C2410_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_DAVINCI_WATCHDOG=m
 CONFIG_SUNXI_WATCHDOG=m
-CONFIG_IMX2_WDT=m
 CONFIG_UX500_WATCHDOG=y
 CONFIG_SIRFSOC_WATCHDOG=y
 CONFIG_TEGRA_WATCHDOG=m
@@ -715,6 +705,7 @@ CONFIG_REGULATOR_TWL4030=y
 # Media drivers
 #
 # CONFIG_RC_ST is not set
+CONFIG_IR_SUNXI=m
 
 #
 # Media digital TV PCI Adapters
@@ -725,10 +716,11 @@ CONFIG_REGULATOR_TWL4030=y
 # CONFIG_VIDEO_SH_VOU is not set
 CONFIG_VIDEO_OMAP3=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
-CONFIG_VIDEO_MX3=m
+# CONFIG_VIDEO_RCAR_VIN is not set
+# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
+# CONFIG_VIDEO_SH_MOBILE_CEU is not set
 # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
 # CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
-# CONFIG_VIDEO_CODA is not set
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
@@ -740,14 +732,6 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 #
 CONFIG_TEGRA_HOST1X=y
 CONFIG_TEGRA_HOST1X_FIREWALL=y
-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
@@ -755,37 +739,30 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 # 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_FIMD is not set
-CONFIG_DRM_EXYNOS_HDMI=y
-CONFIG_DRM_EXYNOS_VIDI=y
-CONFIG_DRM_EXYNOS_G2D=y
-CONFIG_DRM_EXYNOS_IPP=y
 # CONFIG_DRM_EXYNOS_FIMC is not set
 # CONFIG_DRM_EXYNOS_ROTATOR is not set
 CONFIG_DRM_RCAR_DU=m
 CONFIG_DRM_SHMOBILE=m
+CONFIG_DRM_MSM=m
+# CONFIG_DRM_MSM_FBDEV is not set
+# CONFIG_DRM_MSM_REGISTER_LOGGING 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_FILLRECT=y
-CONFIG_FB_SYS_COPYAREA=y
-CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_FOPS=y
+# CONFIG_FB_MODE_HELPERS is not set
 
 #
 # Frame buffer hardware drivers
@@ -805,7 +782,6 @@ CONFIG_EXYNOS_VIDEO=y
 # CONFIG_EXYNOS_MIPI_DSI 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
@@ -817,30 +793,18 @@ CONFIG_VIDEOMODE_HELPERS=y
 # HD-Audio
 #
 CONFIG_SND_HDA_TEGRA=m
-CONFIG_SND_ARMAACI=m
 # CONFIG_SND_SOC_ADI is not set
-CONFIG_SND_DAVINCI_SOC=m
+CONFIG_SND_EDMA_SOC=m
 CONFIG_SND_DAVINCI_SOC_MCASP=m
 CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
 CONFIG_SND_AM33XX_SOC_EVM=m
 
-#
-# Common SoC Audio options for Freescale CPUs:
-#
-CONFIG_SND_SOC_IMX_PCM_DMA=m
-CONFIG_SND_IMX_SOC=m
-CONFIG_SND_SOC_IMX_SSI=m
-CONFIG_SND_SOC_IMX_PCM_FIQ=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_SGTL5000=m
-CONFIG_SND_SOC_IMX_SPDIF=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_ROCKCHIP_I2S=m
 CONFIG_SND_SOC_SAMSUNG=m
-CONFIG_SND_S3C_DMA=m
 CONFIG_SND_SAMSUNG_PCM=m
 CONFIG_SND_SAMSUNG_SPDIF=m
 CONFIG_SND_SAMSUNG_I2S=m
@@ -848,6 +812,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
+CONFIG_SND_SOC_ODROIDX2=m
 
 #
 # SoC Audio support for SuperH
@@ -857,6 +822,7 @@ 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_SIRF_USP=m
 CONFIG_SND_SOC_UX500=m
 CONFIG_SND_SOC_UX500_PLAT_DMA=m
 
@@ -866,13 +832,12 @@ CONFIG_SND_SOC_UX500_PLAT_DMA=m
 CONFIG_SND_SOC_WM_HUBS=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
-CONFIG_SND_SOC_TLV320AIC23=m
-CONFIG_SND_SOC_TLV320AIC23_I2C=m
 CONFIG_SND_SOC_WM8994=m
 
 #
 # USB Host Controller Drivers
 #
+CONFIG_USB_XHCI_RCAR=m
 CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_EHCI_HCD_OMAP=y
 CONFIG_USB_EHCI_MSM=y
@@ -906,7 +871,7 @@ CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MSM_OTG=m
-CONFIG_USB_MXS_PHY=m
+CONFIG_USB_RCAR_PHY=m
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_MMC=y
 
@@ -918,18 +883,15 @@ CONFIG_MMC_BLOCK=y
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_ARMMMCI=m
-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_S3C=m
 CONFIG_MMC_SDHCI_SIRF=m
 CONFIG_MMC_SDHCI_S3C_DMA=y
+CONFIG_MMC_SDHCI_ST=m
 CONFIG_MMC_OMAP=m
 CONFIG_MMC_OMAP_HS=m
 CONFIG_MMC_SDHCI_MSM=m
-CONFIG_MMC_MXC=m
 CONFIG_MMC_TMIO_CORE=m
 CONFIG_MMC_SDHI=m
 CONFIG_MMC_SH_MMCIF=m
@@ -949,15 +911,11 @@ CONFIG_MMC_SUNXI=m
 #
 # on-CPU RTC drivers
 #
-CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_OMAP=m
 CONFIG_RTC_DRV_S3C=m
-CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_PL031=m
 # CONFIG_RTC_DRV_VT8500 is not set
 CONFIG_RTC_DRV_SUNXI=m
 CONFIG_RTC_DRV_TEGRA=m
-CONFIG_RTC_DRV_MXC=m
 CONFIG_RTC_DRV_SIRFSOC=m
 
 #
@@ -965,8 +923,6 @@ CONFIG_RTC_DRV_SIRFSOC=m
 #
 # CONFIG_AMBA_PL08X is not set
 # CONFIG_DW_DMAC_PCI is not set
-CONFIG_MX3_IPU=y
-CONFIG_MX3_IPU_IRQS=4
 # CONFIG_TEGRA20_APB_DMA is not set
 CONFIG_SH_DMAE_BASE=y
 # CONFIG_SH_DMAE is not set
@@ -984,6 +940,8 @@ CONFIG_SH_DMAE_BASE=y
 # CONFIG_TI_CPPI41 is not set
 # CONFIG_K3_DMA is not set
 CONFIG_XILINX_VDMA=m
+CONFIG_DMA_SUN6I=m
+CONFIG_DMA_VIRTUAL_CHANNELS=m
 
 #
 # DMA Clients
@@ -1025,8 +983,6 @@ CONFIG_XEN_PRIVCMD=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
 
@@ -1052,6 +1008,10 @@ CONFIG_COMMON_CLK_SAMSUNG=y
 #
 # CONFIG_HWSPINLOCK_OMAP is not set
 # CONFIG_HSEM_U8500 is not set
+
+#
+# Clock Source drivers
+#
 CONFIG_DW_APB_TIMER=y
 CONFIG_DW_APB_TIMER_OF=y
 CONFIG_SUN4I_TIMER=y
@@ -1068,13 +1028,14 @@ CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_EXYNOS_MCT=y
 CONFIG_CLKSRC_SAMSUNG_PWM=y
 CONFIG_VF_PIT_TIMER=y
+CONFIG_MTK_TIMER=y
+CONFIG_SYS_SUPPORTS_SH_TMU=y
+CONFIG_SH_TIMER_TMU=y
 CONFIG_PL320_MBOX=y
-CONFIG_OMAP_MBOX=m
 CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_IOMMU_API=y
 CONFIG_OMAP_IOMMU=y
-CONFIG_OMAP_IOVMM=m
 # CONFIG_OMAP_IOMMU_DEBUG is not set
 # CONFIG_TEGRA_IOMMU_GART is not set
 # CONFIG_TEGRA_IOMMU_SMMU is not set
@@ -1113,16 +1074,19 @@ CONFIG_TEGRA30_MC=y
 # CONFIG_PWM_LP3943 is not set
 # CONFIG_PWM_PCA9685 is not set
 # CONFIG_PWM_RENESAS_TPU is not set
+CONFIG_PWM_ROCKCHIP=m
 # CONFIG_PWM_SAMSUNG is not set
+CONFIG_PWM_STI=m
 # 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_GIC_NON_BANKED=y
+CONFIG_BRCMSTB_L2_IRQ=y
 CONFIG_DW_APB_ICTL=y
+CONFIG_RENESAS_INTC_IRQPIN=y
 CONFIG_IRQ_CROSSBAR=y
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_STI_RESET_SYSCFG=y
@@ -1132,16 +1096,22 @@ CONFIG_STIH416_RESET=y
 #
 # PHY Subsystem
 #
+CONFIG_PHY_BERLIN_SATA=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
+CONFIG_PHY_MIPHY365X=m
 CONFIG_OMAP_CONTROL_PHY=m
 CONFIG_TWL4030_USB=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=y
 CONFIG_PHY_EXYNOS5250_SATA=m
+CONFIG_PHY_HIX5HD2_SATA=m
 CONFIG_PHY_SUN4I_USB=m
-# CONFIG_PHY_EXYNOS4210_USB2 is not set
-# CONFIG_PHY_EXYNOS4X12_USB2 is not set
-# CONFIG_PHY_EXYNOS5250_USB2 is not set
+CONFIG_PHY_EXYNOS4210_USB2=y
+CONFIG_PHY_EXYNOS4X12_USB2=y
+CONFIG_PHY_EXYNOS5250_USB2=y
 CONFIG_PHY_EXYNOS5_USBDRD=m
+CONFIG_PHY_QCOM_APQ8064_SATA=m
+CONFIG_PHY_QCOM_IPQ806X_SATA=m
+CONFIG_RAS=y
 
 #
 # File systems
@@ -1162,12 +1132,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
 #
 # Runtime Testing
 #
-CONFIG_DEBUG_IMX_UART_PORT=1
 CONFIG_DEBUG_VF_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 is not set
 # CONFIG_PID_IN_CONTEXTIDR is not set
 
 #
@@ -1200,6 +1165,12 @@ CONFIG_GRKERNSEC_RWXMAP_LOG=y
 # CONFIG_CRYPTO_PCRYPT is not set
 CONFIG_CRYPTO_ABLK_HELPER=m
 
+#
+# Digest
+#
+CONFIG_CRYPTO_SHA1_ARM_NEON=m
+CONFIG_CRYPTO_SHA512_ARM_NEON=m
+
 #
 # Ciphers
 #
@@ -1211,14 +1182,12 @@ CONFIG_CRYPTO_AES_ARM_BS=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_DES=m
-CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_UX500 is not set
+CONFIG_CRYPTO_DEV_QCE=m
 
 #
 # Library routines
 #
-CONFIG_STMP_DEVICE=y
-CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_CPU_RMAP=y
 CONFIG_DDR=y