CHROMIUM: config: re-sync kernel config after dma-buf kds separation

[cascardo/linux.git] / chromeos / config / armel / chromeos-exynos5.flavour.config

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index 05e7ad9..98884fb 100644 (file)
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -6,6 +6,7 @@ CONFIG_ARCH_EXYNOS=y
 # CONFIG_ARCH_EXYNOS4 is not set
 CONFIG_ARCH_EXYNOS5=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
+CONFIG_ARCH_HAS_OPP=y
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_DEFAULT=y
@@ -20,6 +21,9 @@ CONFIG_ARM_DMA_USE_IOMMU=y
 # CONFIG_ARM_ERRATA_751472 is not set
 # CONFIG_ARM_ERRATA_754327 is not set
 # CONFIG_ARM_ERRATA_764369 is not set
+CONFIG_ARM_ERRATA_766421=y
+CONFIG_ARM_ERRATA_773022=y
+CONFIG_ARM_ERRATA_774769=y
 CONFIG_ARM_EXYNOS5250_CPUFREQ=y
 CONFIG_ARM_EXYNOS_CPUFREQ=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -32,7 +36,9 @@ CONFIG_BACKLIGHT_PWM=y
 CONFIG_BATTERY_SBS=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
+CONFIG_BUSFREQ_OPP=y
 # CONFIG_CACHE_L2X0 is not set
+CONFIG_CHARGER_CHROMEOS_EC=y
 CONFIG_CHARGER_TPS65090=y
 CONFIG_CHROMEOS_RAMOOPS_RAM_START=0x41f00000
 CONFIG_CMDLINE="root=/dev/nfs rw nfsroot=192.168.0.10:/media/opt/cramfs console=ttySAC2,115200 ip=192.168.0.20:192.168.0.10:192.168.0.1:255.255.255.0:test::off init=/linuxrc"
@@ -55,11 +61,12 @@ CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMATEST is not set
 CONFIG_DMA_ENGINE=y
-CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_SHARED_BUFFER_USES_KDS=y
 CONFIG_DRM=y
 CONFIG_DRM_EXYNOS=y
+CONFIG_DRM_EXYNOS_DEBUG=y
 CONFIG_DRM_EXYNOS_DMABUF=y
+CONFIG_DRM_EXYNOS_DP=y
 CONFIG_DRM_EXYNOS_FIMD=y
 CONFIG_DRM_EXYNOS_HDMI=y
 # CONFIG_DRM_EXYNOS_VIDI is not set
@@ -67,6 +74,8 @@ CONFIG_DRM_EXYNOS_HDMI=y
 # CONFIG_DRM_I2C_SIL164 is not set
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_PS8622=y
+CONFIG_DRM_PTN3460=y
 # CONFIG_DRM_UDL is not set
 # CONFIG_DW_DMAC is not set
 # CONFIG_DW_WATCHDOG is not set
@@ -76,7 +85,6 @@ CONFIG_EXYNOS4_SETUP_MIPI_DSIM=y
 CONFIG_EXYNOS4_SETUP_TVOUT=y
 CONFIG_EXYNOS4_SETUP_USB_PHY=y
 CONFIG_EXYNOS_DEV_SYSMMU=y
-CONFIG_EXYNOS_DP=y
 CONFIG_EXYNOS_IOMMU=y
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
 # CONFIG_EXYNOS_LCD_S6E8AX0 is not set
@@ -90,8 +98,6 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_EXYNOS_FIMD_V8=y
 CONFIG_FB_MIPI_DSIM=y
-# CONFIG_FPE_FASTFPE is not set
-# CONFIG_FPE_NWFPE is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_GENERIC_IRQ_CHIP=y
 # CONFIG_GPIO_PL061 is not set
@@ -107,7 +113,6 @@ CONFIG_I2C_CHROMEOS_EC=y
 CONFIG_I2C_S3C2410=y
 # CONFIG_INPUT_PWM_BEEPER is not set
 CONFIG_IOMMU_API=y
-CONFIG_KDS=y
 CONFIG_KEYBOARD_MKBP=y
 # CONFIG_KS8842 is not set
 # CONFIG_LCD_AMS369FG06 is not set
@@ -125,15 +130,22 @@ CONFIG_LCD_PLATFORM=y
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_MACH_EXYNOS5_DT=y
 # CONFIG_MALI_BASE_ALLOC_FAIL is not set
-# CONFIG_MALI_BASE_TRACK_MEMLEAK is not set
 # CONFIG_MALI_DEBUG is not set
 CONFIG_MALI_EXPERT=y
-# CONFIG_MALI_GATOR_SUPPORT is not set
+CONFIG_MALI_HWC_TRACE=y
 # CONFIG_MALI_NO_MALI is not set
+CONFIG_MALI_PLATFORM_FAKE=y
 CONFIG_MALI_PLATFORM_THIRDPARTY=y
 CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="exynos5"
+# CONFIG_MALI_QA_LEAK is not set
+# CONFIG_MALI_QA_RESFAIL is not set
+# CONFIG_MALI_SYSTEM_TRACE is not set
 CONFIG_MALI_T6XX=y
-# CONFIG_MALI_UNCACHED is not set
+# CONFIG_MALI_T6XX_DEBUG_SYS is not set
+# CONFIG_MALI_T6XX_DEMAND_POLICY is not set
+# CONFIG_MALI_T6XX_ENABLE_TRACE is not set
+# CONFIG_MALI_T6XX_RT_PM is not set
+CONFIG_MALI_UNCACHED=y
 # CONFIG_MAX63XX_WATCHDOG is not set
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_MEDIA_EXYNOS=y
@@ -152,7 +164,9 @@ CONFIG_MEDIA_TUNER_XC2028=y
 CONFIG_MEDIA_TUNER_XC4000=y
 CONFIG_MEDIA_TUNER_XC5000=y
 CONFIG_MFD_CHROMEOS_EC=y
+CONFIG_MFD_CHROMEOS_EC_I2C=y
 CONFIG_MFD_MAX77686=y
+CONFIG_MFD_S5M_CORE=y
 CONFIG_MFD_TPS65090=y
 # CONFIG_MFD_TPS6586X is not set
 CONFIG_MFD_WM8994=y
@@ -161,14 +175,12 @@ CONFIG_MMC_DW=y
 CONFIG_MMC_DW_IDMAC=y
 CONFIG_MMC_DW_PLTFM=y
 # CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDHCI_S3C=y
-# CONFIG_MMC_SDHCI_S3C_DMA is not set
+# CONFIG_MMC_SDHCI_S3C is not set
 CONFIG_NEED_MACH_MEMORY_H=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEON=y
 # CONFIG_NET_DMA is not set
 CONFIG_NO_IOPORT=y
-CONFIG_OABI_COMPAT=y
 # CONFIG_OC_ETM is not set
 CONFIG_PAGE_OFFSET=0x80000000
 CONFIG_PL330_DMA=y
@@ -176,18 +188,14 @@ CONFIG_PLAT_S5P=y
 CONFIG_PLAT_SAMSUNG=y
 CONFIG_PM_GENERIC_DOMAINS=y
 CONFIG_PM_GENERIC_DOMAINS_RUNTIME=y
-CONFIG_PTN3460=y
+CONFIG_PM_OPP=y
 CONFIG_REGMAP_IRQ=y
+CONFIG_REGULATOR_CHROMEOS_EC_TPS65090=y
 CONFIG_REGULATOR_MAX77686=y
+CONFIG_REGULATOR_S5M8767=y
 CONFIG_REGULATOR_TPS65090=y
 CONFIG_REGULATOR_WM8994=y
 CONFIG_RT2500USB=m
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_CRYPTO=y
-# CONFIG_RT2X00_LIB_DEBUGFS is not set
-CONFIG_RT2X00_LIB_LEDS=y
-CONFIG_RT2X00_LIB_USB=m
 CONFIG_RTC_DRV_MAX77686=y
 # CONFIG_RTC_DRV_PL030 is not set
 # CONFIG_RTC_DRV_PL031 is not set
@@ -202,6 +210,7 @@ CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_GPIO_TRACK=y
 CONFIG_S3C_LOWLEVEL_UART_PORT=3
 CONFIG_S5P_GPIO_DRVSTR=y
+CONFIG_S5P_GPIO_INT=y
 CONFIG_S5P_PM=y
 CONFIG_S5P_SLEEP=y
 CONFIG_SAMSUNG_CLKSRC=y
@@ -212,9 +221,11 @@ CONFIG_SAMSUNG_GPIOLIB_4BIT=y
 CONFIG_SAMSUNG_GPIO_EXTRA=0
 CONFIG_SAMSUNG_IRQ_VIC_TIMER=y
 # CONFIG_SAMSUNG_PD is not set
-# CONFIG_SAMSUNG_PM_CHECK is not set
+CONFIG_SAMSUNG_PM_CHECK=y
+CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE=64
 # CONFIG_SAMSUNG_PM_DEBUG is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SENSORS_LM90=y
 CONFIG_SENSORS_NTC_THERMISTOR=y
 CONFIG_SENSORS_S3C=y
 CONFIG_SENSORS_S3C_RAW=y
@@ -232,13 +243,16 @@ CONFIG_SMSC911X=y
 # CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SND_SAMSUNG_I2S=y
 CONFIG_SND_SOC_EXYNOS_MAX98095=y
+CONFIG_SND_SOC_MAX98088=y
 CONFIG_SND_SOC_MAX98095=y
 CONFIG_SND_SOC_SAMSUNG=y
+CONFIG_SND_SOC_SAMSUNG_HDMI_AUDIO=y
 # CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF is not set
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=y
 # CONFIG_SND_SOC_SMDK_WM8994_PCM is not set
 CONFIG_SND_SOC_WM8994=y
 CONFIG_SND_SOC_WM_HUBS=y
+CONFIG_SNOW_BITFIX=y
 # CONFIG_SOC_CAMERA is not set
 CONFIG_SOC_EXYNOS5250=y
 # CONFIG_SOFT_WATCHDOG is not set
@@ -299,5 +313,5 @@ CONFIG_VMSPLIT_2G=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
-# CONFIG_XFRM_USER is not set
+CONFIG_XOR_BLOCKS=y
 CONFIG_XZ_DEC_X86=y