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

Now, this is only set for exynos:
CONFIG_DMA_SHARED_BUFFER_USES_KDS=y

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
BUG=chromium:232913
TEST=compile kernel for x86 and arm and verify it still boots

Change-Id: I7f5d9471a7fde4dd01a02ce5f383ab931c47353f
Reviewed-on: https://gerrit.chromium.org/gerrit/48630
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
Commit-Queue: Daniel Kurtz <djkurtz@chromium.org>

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index 69e0247..98884fb 100644 (file)
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -61,6 +61,7 @@ CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_DMATEST is not set
 CONFIG_DMA_ENGINE=y
+CONFIG_DMA_SHARED_BUFFER_USES_KDS=y
 CONFIG_DRM=y
 CONFIG_DRM_EXYNOS=y
 CONFIG_DRM_EXYNOS_DEBUG=y

diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index 6d69616..91cfcbc 100644 (file)
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -41,6 +41,7 @@ CONFIG_DEBUG_LL_UART_NONE=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DMADEVICES is not set
+# CONFIG_DMA_SHARED_BUFFER_USES_KDS is not set
 # CONFIG_DRM is not set
 # CONFIG_DRM_PS8622 is not set
 # CONFIG_EXYNOS_VIDEO is not set

diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index 94499e7..b801462 100644 (file)
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -41,6 +41,7 @@ CONFIG_DEBUG_LL_UART_NONE=y
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DMADEVICES is not set
+# CONFIG_DMA_SHARED_BUFFER_USES_KDS is not set
 # CONFIG_DRM is not set
 # CONFIG_DRM_PS8622 is not set
 # CONFIG_EXYNOS_VIDEO is not set

diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 7688af5..dcea5ae 100644 (file)
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -367,7 +367,6 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DEVTMPFS_SAFE=y
 # CONFIG_DMA_API_DEBUG is not set
 CONFIG_DMA_SHARED_BUFFER=y
-CONFIG_DMA_SHARED_BUFFER_USES_KDS=y
 CONFIG_DM_BHT=y
 CONFIG_DM_BOOTCACHE=y
 CONFIG_DM_BUFIO=y

diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 86006ca..3ec6a5b 100644 (file)
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -186,6 +186,7 @@ CONFIG_DELL_WMI=m
 # CONFIG_DELL_WMI_AIO is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMADEVICES is not set
+# CONFIG_DMA_SHARED_BUFFER_USES_KDS is not set
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set

diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 044e6b6..b41867a 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -202,6 +202,7 @@ CONFIG_DELL_WMI=m
 CONFIG_DEVPORT=y
 CONFIG_DIRECT_GBPAGES=y
 # CONFIG_DMADEVICES is not set
+# CONFIG_DMA_SHARED_BUFFER_USES_KDS is not set
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set