From 32f651194a2c437b26ca17b57f1fd0ff6e03d3d2 Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Fri, 19 Apr 2013 17:23:38 +0800 Subject: [PATCH] CHROMIUM: config: re-sync kernel config after dma-buf kds separation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Now, this is only set for exynos: CONFIG_DMA_SHARED_BUFFER_USES_KDS=y Signed-off-by: Daniel Kurtz 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 Reviewed-by: Daniel Kurtz Tested-by: Daniel Kurtz Commit-Queue: Daniel Kurtz --- chromeos/config/armel/chromeos-exynos5.flavour.config | 1 + chromeos/config/armel/chromeos-tegra2.flavour.config | 1 + chromeos/config/armel/chromiumos-arm.flavour.config | 1 + chromeos/config/base.config | 1 - chromeos/config/i386/common.config | 1 + chromeos/config/x86_64/common.config | 1 + 6 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config index 69e0247b744d..98884fb42858 100644 --- 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 6d69616ddcb7..91cfcbc326ab 100644 --- 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 94499e7c1404..b8014620de6f 100644 --- 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 7688af535487..dcea5ae87d54 100644 --- 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 86006cac9a93..3ec6a5bd9cac 100644 --- 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 044e6b6ff01f..b41867a9387d 100644 --- 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 -- 2.20.1