]> git.ipfire.org Git - ipfire-3.x.git/blobdiff - kernel/config-armv7hl-default
kernel: Update to 3.16.2
[ipfire-3.x.git] / kernel / config-armv7hl-default
index e3a135c23ec3b174e8e8171d36098e3e8e2c32d0..4b5562ef1174fe62799d42daf2d8812dfd59f564 100644 (file)
@@ -1,7 +1,11 @@
 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
@@ -45,6 +49,7 @@ CONFIG_SLUB_CPU_PARTIAL=y
 # IO Schedulers
 #
 CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
 
 #
 # System Type
@@ -60,56 +65,30 @@ 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 EBU SoC variants
-#
-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_MVEBU is not set
 CONFIG_ARCH_BCM=y
-
-#
-# Broadcom SoC Selection
-#
 # CONFIG_ARCH_BCM_MOBILE is not set
 CONFIG_ARCH_BCM_5301X=y
 CONFIG_ARCH_BERLIN=y
-
-#
-# Marvell Berlin SoC variants
-#
 # 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
 CONFIG_ARCH_HI3xxx=y
 CONFIG_ARCH_KEYSTONE=y
 CONFIG_ARCH_MXC=y
-
-#
-# Freescale i.MX support
-#
 # CONFIG_MXC_DEBUG_BOARD is not set
 
-#
-# i.MX51 machines:
-#
-# 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 is not set
+# CONFIG_MACH_IMX51_DT 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
 
 #
@@ -125,6 +104,10 @@ CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_MACH_OMAP_GENERIC=y
+
+#
+# TI OMAP/AM/DM/DRA Family
+#
 CONFIG_ARCH_OMAP=y
 CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
@@ -169,10 +152,6 @@ CONFIG_MACH_TI8148EVM=y
 # CONFIG_OMAP3_EMU is not set
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 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
@@ -182,12 +161,37 @@ CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_STI=y
 CONFIG_SOC_STIH415=y
 CONFIG_SOC_STIH416=y
-CONFIG_ARCH_SHMOBILE=y
-CONFIG_ARCH_SHMOBILE_MULTI=y
+CONFIG_ARCH_EXYNOS=y
+# CONFIG_ARCH_EXYNOS3 is not set
+CONFIG_ARCH_EXYNOS4=y
+CONFIG_ARCH_EXYNOS5=y
+
+#
+# EXYNOS SoCs
+#
+CONFIG_CPU_EXYNOS4210=y
+CONFIG_SOC_EXYNOS4212=y
+CONFIG_SOC_EXYNOS4412=y
+CONFIG_SOC_EXYNOS5250=y
+CONFIG_SOC_EXYNOS5260=y
+CONFIG_SOC_EXYNOS5410=y
+CONFIG_SOC_EXYNOS5420=y
+CONFIG_SOC_EXYNOS5440=y
+CONFIG_SOC_EXYNOS5800=y
+# CONFIG_EXYNOS5420_MCPM is not set
+CONFIG_PLAT_SAMSUNG=y
+
+#
+# Boot options
+#
+CONFIG_S5P_DEV_MFC=y
 
 #
-# Renesas ARM SoCs System Type
+# Power management
 #
+# CONFIG_SAMSUNG_PM_CHECK is not set
+CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_SHMOBILE_MULTI=y
 # CONFIG_ARCH_EMEV2 is not set
 # CONFIG_ARCH_R7S72100 is not set
 # CONFIG_ARCH_R8A7790 is not set
@@ -198,6 +202,10 @@ CONFIG_ARCH_SHMOBILE_MULTI=y
 #
 CONFIG_SHMOBILE_TIMER_HZ=128
 CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
+CONFIG_MACH_SUN5I=y
+CONFIG_MACH_SUN6I=y
+CONFIG_MACH_SUN7I=y
 CONFIG_ARCH_SIRF=y
 
 #
@@ -208,10 +216,6 @@ CONFIG_ARCH_PRIMA2=y
 CONFIG_ARCH_MARCO=y
 CONFIG_SIRF_IRQ=y
 CONFIG_ARCH_TEGRA=y
-
-#
-# NVIDIA Tegra options
-#
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
@@ -219,20 +223,12 @@ CONFIG_ARCH_TEGRA_124_SOC=y
 CONFIG_TEGRA_AHB=y
 CONFIG_ARCH_U8500=y
 CONFIG_UX500_SOC_DB8500=y
-
-#
-# Ux500 target platform (boards)
-#
 CONFIG_MACH_MOP500=y
 # CONFIG_MACH_HREFV60 is not set
 # CONFIG_MACH_SNOWBALL is not set
 CONFIG_UX500_AUTO_PLATFORM=y
 CONFIG_UX500_DEBUG_UART=2
 CONFIG_ARCH_VEXPRESS=y
-
-#
-# Versatile Express platform type
-#
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VEXPRESS_DCSCB=y
@@ -256,8 +252,6 @@ CONFIG_TRUSTED_FOUNDATIONS=y
 #
 # Processor Type
 #
-CONFIG_CPU_PJ4=y
-CONFIG_CPU_PJ4B=y
 CONFIG_CPU_V7=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
@@ -283,23 +277,20 @@ CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_MIGHT_HAVE_CACHE_L2X0=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CACHE_PL310=y
-CONFIG_CACHE_TAUROS2=y
+CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL310_ERRATA_727915=y
+CONFIG_PL310_ERRATA_753970=y
+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_IWMMXT=y
-CONFIG_PJ4B_ERRATA_4742=y
 # CONFIG_ARM_ERRATA_430973 is not set
-CONFIG_PL310_ERRATA_588369=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_764369=y
-CONFIG_PL310_ERRATA_769419=y
 CONFIG_ARM_ERRATA_775420=y
 CONFIG_ARM_ERRATA_798181=y
 # CONFIG_ARM_ERRATA_773022 is not set
@@ -316,9 +307,11 @@ CONFIG_PCI_DOMAINS=y
 # PCI host controller drivers
 #
 CONFIG_PCIE_DW=y
+CONFIG_PCI_EXYNOS=y
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_TEGRA=y
 CONFIG_PCI_RCAR_GEN2=y
+CONFIG_PCI_RCAR_GEN2_PCIE=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
@@ -345,9 +338,9 @@ CONFIG_NR_CPUS=4
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARCH_NR_GPIO=1024
+CONFIG_HZ_FIXED=200
+CONFIG_HZ=200
 # 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_MMU_NOTIFIER=y
@@ -365,8 +358,17 @@ CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttyS
 #
 # ARM CPU frequency scaling drivers
 #
-# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
-# CONFIG_ARM_IMX6Q_CPUFREQ is not set
+CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
+# CONFIG_ARM_DT_BL_CPUFREQ is not set
+# CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set
+CONFIG_ARM_EXYNOS_CPUFREQ=y
+CONFIG_ARM_EXYNOS4210_CPUFREQ=y
+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
 
@@ -377,6 +379,7 @@ CONFIG_ARM_TEGRA_CPUFREQ=y
 # CONFIG_ARM_HIGHBANK_CPUIDLE is not set
 # CONFIG_ARM_ZYNQ_CPUIDLE is not set
 # CONFIG_ARM_U8500_CPUIDLE is not set
+# CONFIG_ARM_EXYNOS_CPUIDLE is not set
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
@@ -392,6 +395,9 @@ CONFIG_KERNEL_MODE_NEON=y
 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
 
 #
 # Classification
@@ -413,6 +419,7 @@ CONFIG_SOC_BUS=y
 # CONFIG_IMX_WEIM is not set
 # CONFIG_OMAP_OCP2SCP is not set
 CONFIG_OMAP_INTERCONNECT=y
+CONFIG_ARM_CCI=y
 
 #
 # Device Tree and Open Firmware support
@@ -458,7 +465,6 @@ CONFIG_SUN4I_EMAC=m
 # CONFIG_MACB is not set
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=m
-# CONFIG_DWMAC_SOCFPGA is not set
 CONFIG_DWMAC_SUNXI=y
 CONFIG_DWMAC_STI=y
 CONFIG_TI_DAVINCI_EMAC=m
@@ -486,14 +492,20 @@ CONFIG_MDIO_SUN4I=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
 
+#
+# Input device support
+#
+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
+# CONFIG_KEYBOARD_ST_KEYSCAN is not set
 CONFIG_KEYBOARD_SH_KEYSC=m
-CONFIG_KEYBOARD_OMAP4=m
 # CONFIG_INPUT_AB8500_PONKEY is not set
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 CONFIG_INPUT_SIRFSOC_ONKEY=y
@@ -508,6 +520,9 @@ CONFIG_INPUT_SIRFSOC_ONKEY=y
 #
 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
@@ -522,6 +537,7 @@ CONFIG_HVC_XEN=y
 CONFIG_HVC_XEN_FRONTEND=y
 CONFIG_HW_RANDOM_OMAP=y
 CONFIG_HW_RANDOM_OMAP3_ROM=y
+CONFIG_HW_RANDOM_EXYNOS=y
 CONFIG_HW_RANDOM_MSM=m
 
 #
@@ -529,17 +545,20 @@ 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
 CONFIG_I2C_RIIC=m
+CONFIG_I2C_S3C2410=m
 CONFIG_I2C_SH_MOBILE=m
 CONFIG_I2C_SIRF=m
 CONFIG_I2C_ST=m
+CONFIG_I2C_SUN6I_P2WI=m
 CONFIG_I2C_TEGRA=m
 CONFIG_I2C_VERSATILE=m
-# CONFIG_I2C_WMT is not set
+CONFIG_I2C_WMT=m
 CONFIG_I2C_RCAR=m
 
 #
@@ -547,6 +566,12 @@ CONFIG_I2C_RCAR=m
 #
 CONFIG_SPMI_MSM_PMIC_ARB=m
 
+#
+# HSI controllers
+#
+CONFIG_OMAP_SSI=m
+CONFIG_OMAP_SSI_PORT=m
+
 #
 # PPS support
 #
@@ -568,30 +593,37 @@ CONFIG_PINCTRL_AB8505=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
-CONFIG_PINCTRL_SUNXI=y
 CONFIG_PINCTRL_ST=y
 CONFIG_PINCTRL_TEGRA=y
 CONFIG_PINCTRL_TEGRA20=y
 CONFIG_PINCTRL_TEGRA30=y
 CONFIG_PINCTRL_TEGRA114=y
 CONFIG_PINCTRL_TEGRA124=y
-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_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_SUNXI_COMMON=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I_A10S=y
+CONFIG_PINCTRL_SUN5I_A13=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN7I_A20=y
 # CONFIG_PINCTRL_WM8850 is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB_IRQCHIP=y
 
 #
 # Memory mapped GPIO drivers:
@@ -599,7 +631,9 @@ CONFIG_GPIOLIB_IRQCHIP=y
 # 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
 
 #
@@ -612,23 +646,31 @@ CONFIG_GPIO_PL061=y
 # 1-wire Slaves
 #
 # CONFIG_POWER_RESET_MSM is not set
+CONFIG_POWER_RESET_SUN6I=y
+CONFIG_POWER_RESET_KEYSTONE=y
 
 #
 # Native drivers
 #
 CONFIG_RCAR_THERMAL=y
 CONFIG_DB8500_THERMAL=y
-CONFIG_ARMADA_THERMAL=y
 
 #
 # Texas Instruments thermal drivers
 #
 # CONFIG_TI_SOC_THERMAL is not set
 
+#
+# Samsung thermal drivers
+#
+CONFIG_EXYNOS_THERMAL=m
+CONFIG_EXYNOS_THERMAL_CORE=y
+
 #
 # Watchdog Device Drivers
 #
 CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_S3C2410_WATCHDOG=m
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_DAVINCI_WATCHDOG=m
 CONFIG_SUNXI_WATCHDOG=m
@@ -654,6 +696,7 @@ CONFIG_MFD_DB8500_PRCMU=y
 #
 # STMicroelectronics STMPE Interface Drivers
 #
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_OMAP_USB_HOST=y
 # CONFIG_MFD_VX855 is not set
 CONFIG_REGULATOR_88PM8607=y
@@ -680,8 +723,16 @@ CONFIG_REGULATOR_TWL4030=y
 # CONFIG_VIDEO_DM6446_CCDC 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_OMAP3=m
+# CONFIG_VIDEO_OMAP3_DEBUG is not set
+CONFIG_VIDEO_MX3=m
+# 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
+CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 # CONFIG_VIDEO_TI_VPE is not set
 
 #
@@ -689,11 +740,14 @@ CONFIG_REGULATOR_TWL4030=y
 #
 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
@@ -703,14 +757,15 @@ CONFIG_DRM_MIPI_DSI=y
 # 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_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_TEGRA=m
 CONFIG_DRM_TEGRA_FBDEV=y
 # CONFIG_DRM_TEGRA_DEBUG is not set
@@ -727,6 +782,9 @@ CONFIG_DRM_PANEL=y
 #
 # Frame buffer Devices
 #
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_SYS_FOPS=y
 
 #
@@ -737,11 +795,14 @@ CONFIG_FB_SYS_FOPS=y
 # CONFIG_FB_VT8500 is not set
 # CONFIG_FB_WM8505 is not set
 # CONFIG_FB_SH_MOBILE_LCDC is not set
+# CONFIG_FB_S3C is not set
 # CONFIG_FB_XILINX is not set
 # CONFIG_FB_DA8XX is not set
 CONFIG_XEN_FBDEV_FRONTEND=y
 # CONFIG_FB_MX3 is not set
 # CONFIG_OMAP2_DSS is not set
+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
@@ -749,32 +810,44 @@ 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_HDA_TEGRA=m
 CONFIG_SND_ARMAACI=m
-CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # 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
+
+#
+# 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_DMA=m
-CONFIG_SND_SOC_IMX_AUDMUX=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_KIRKWOOD_SOC_ARMADA370_DB=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
+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
 
 #
 # SoC Audio support for SuperH
@@ -784,21 +857,29 @@ 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
+CONFIG_SND_SOC_UX500=m
+CONFIG_SND_SOC_UX500_PLAT_DMA=m
 
 #
 # CODEC drivers
 #
+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_EHCI_MXC=y
 CONFIG_USB_EHCI_HCD_OMAP=y
+CONFIG_USB_EHCI_MSM=y
 CONFIG_USB_EHCI_TEGRA=y
+CONFIG_USB_EHCI_EXYNOS=y
 CONFIG_USB_OHCI_HCD_OMAP3=y
+CONFIG_USB_OHCI_EXYNOS=y
 CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y
 CONFIG_USB_UHCI_PLATFORM=y
 CONFIG_USB_IMX21_HCD=y
@@ -812,12 +893,19 @@ CONFIG_USB_MUSB_AM35X=m
 # CONFIG_USB_TI_CPPI41_DMA is not set
 # CONFIG_USB_TUSB_OMAP_DMA is not set
 
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_EXYNOS=m
+CONFIG_USB_DWC3_KEYSTONE=m
+
 #
 # USB Physical Layer drivers
 #
 # CONFIG_AB8500_USB is not set
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_MSM_OTG=m
 CONFIG_USB_MXS_PHY=m
 CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_MMC=y
@@ -835,7 +923,9 @@ 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_OMAP=m
 CONFIG_MMC_OMAP_HS=m
 CONFIG_MMC_SDHCI_MSM=m
@@ -844,6 +934,7 @@ CONFIG_MMC_TMIO_CORE=m
 CONFIG_MMC_SDHI=m
 CONFIG_MMC_SH_MMCIF=m
 CONFIG_MMC_WMT=y
+CONFIG_MMC_SUNXI=m
 
 #
 # LED drivers
@@ -860,6 +951,7 @@ CONFIG_MMC_WMT=y
 #
 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
@@ -873,7 +965,6 @@ CONFIG_RTC_DRV_SIRFSOC=m
 #
 # 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 is not set
@@ -892,6 +983,7 @@ CONFIG_SH_DMAE_BASE=y
 # CONFIG_DMA_OMAP is not set
 # CONFIG_TI_CPPI41 is not set
 # CONFIG_K3_DMA is not set
+CONFIG_XILINX_VDMA=m
 
 #
 # DMA Clients
@@ -901,6 +993,7 @@ CONFIG_SH_DMAE_BASE=y
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_UIO_PCI_GENERIC is not set
 # CONFIG_UIO_MF624 is not set
+# CONFIG_VFIO is not set
 CONFIG_VIRTIO=m
 
 #
@@ -937,21 +1030,22 @@ CONFIG_XEN_PRIVCMD=y
 # CONFIG_DRM_IMX is not set
 # CONFIG_BT_NOKIA_H4P is not set
 
+#
+# SOC (System On Chip) specific Drivers
+#
+CONFIG_QCOM_GSBI=m
+
 #
 # 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_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_DOVE_CLK=y
+CONFIG_COMMON_CLK_SAMSUNG=y
 
 #
 # Hardware Spinlock drivers
@@ -960,7 +1054,6 @@ CONFIG_DOVE_CLK=y
 # CONFIG_HSEM_U8500 is not set
 CONFIG_DW_APB_TIMER=y
 CONFIG_DW_APB_TIMER_OF=y
-CONFIG_ARMADA_370_XP_TIMER=y
 CONFIG_SUN4I_TIMER=y
 CONFIG_SUN5I_HSTIMER=y
 CONFIG_VT8500_TIMER=y
@@ -972,17 +1065,32 @@ CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_ARM_GLOBAL_TIMER=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
+CONFIG_CLKSRC_EXYNOS_MCT=y
+CONFIG_CLKSRC_SAMSUNG_PWM=y
 CONFIG_VF_PIT_TIMER=y
 CONFIG_PL320_MBOX=y
-# CONFIG_OMAP2PLUS_MBOX is not set
-# CONFIG_OMAP_IOMMU is not set
+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
+# CONFIG_EXYNOS_IOMMU is not set
 # CONFIG_SHMOBILE_IOMMU is not set
 
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+CONFIG_OMAP_REMOTEPROC=m
+
 #
 # Rpmsg drivers
 #
+CONFIG_RPMSG=m
 # CONFIG_TI_AEMIF is not set
 # CONFIG_TI_EMIF is not set
 CONFIG_TEGRA20_MC=y
@@ -991,6 +1099,7 @@ CONFIG_TEGRA30_MC=y
 #
 # Analog to digital converters
 #
+# CONFIG_EXYNOS_ADC is not set
 # CONFIG_LP8788_ADC is not set
 # CONFIG_TWL6030_GPADC is not set
 # CONFIG_XILINX_XADC is not set
@@ -1004,6 +1113,7 @@ 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_SAMSUNG is not set
 # CONFIG_PWM_TEGRA is not set
 # CONFIG_PWM_TIECAP is not set
 # CONFIG_PWM_TIEHRPWM is not set
@@ -1011,6 +1121,7 @@ CONFIG_TEGRA30_MC=y
 # CONFIG_PWM_TWL_LED is not set
 # CONFIG_PWM_VT8500 is not set
 CONFIG_ARM_GIC=y
+CONFIG_GIC_NON_BANKED=y
 CONFIG_DW_APB_ICTL=y
 CONFIG_IRQ_CROSSBAR=y
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
@@ -1021,9 +1132,16 @@ CONFIG_STIH416_RESET=y
 #
 # PHY Subsystem
 #
+CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
 CONFIG_OMAP_CONTROL_PHY=m
 CONFIG_TWL4030_USB=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=y
+CONFIG_PHY_EXYNOS5250_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_EXYNOS5_USBDRD=m
 
 #
 # File systems
@@ -1045,6 +1163,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"
@@ -1093,6 +1212,7 @@ 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
 
 #