CHROMIUM: Config: Added KDS to config

Normalised config, uses defaults set in dma_buf Kconfig

BUG=None
TEST=emerge-daisy chromeos-kernel, boot

Change-Id: I15d694c892cb378bd559c4772c6ba689becd4cf7
Signed-off-by: Ray Smith <Raymond.Smith@arm.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/27732
Tested-by: David Garbett <David.Garbett@arm.com>
Reviewed-by: Anush Elangovan <anush@google.com>
Tested-by: Anush Elangovan <anush@google.com>
Commit-Ready: Anush Elangovan <anush@google.com>

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index 3b0e052..078cb48 100644 (file)
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -53,6 +53,7 @@ CONFIG_DMADEVICES=y
 # 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_DMABUF=y
@@ -103,6 +104,7 @@ 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

diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index 3f5480d..0ea7d61 100644 (file)
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -37,6 +37,7 @@ CONFIG_DEBUG_LL_UART_NONE=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DMADEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_DMA_SHARED_BUFFER_USES_KDS is not set
 # CONFIG_DRM is not set
 # CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_FB_CFB_COPYAREA is not set
@@ -51,6 +52,7 @@ CONFIG_HAVE_ARM_TWD=y
 CONFIG_HZ=100
 CONFIG_I2C_TEGRA=y
 CONFIG_INPUT_OF_MATRIX_KEYMAP=y
+# CONFIG_KDS is not set
 # CONFIG_KEYBOARD_MKBP is not set
 CONFIG_KEYBOARD_TEGRA=y
 # CONFIG_LCD_CLASS_DEVICE is not set

diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index e30ce30..05fbbcc 100644 (file)
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -37,6 +37,7 @@ CONFIG_DEBUG_LL_UART_NONE=y
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DMADEVICES is not set
 # CONFIG_DMA_SHARED_BUFFER is not set
+# CONFIG_DMA_SHARED_BUFFER_USES_KDS is not set
 # CONFIG_DRM is not set
 # CONFIG_EXYNOS_VIDEO is not set
 # CONFIG_FB_CFB_COPYAREA is not set
@@ -51,6 +52,7 @@ CONFIG_HAVE_ARM_TWD=y
 CONFIG_HZ=100
 CONFIG_I2C_TEGRA=y
 CONFIG_INPUT_OF_MATRIX_KEYMAP=y
+# CONFIG_KDS is not set
 # CONFIG_KEYBOARD_MKBP is not set
 CONFIG_KEYBOARD_TEGRA=y
 # CONFIG_LCD_CLASS_DEVICE is not set

diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 5cbd6d0..cc4548b 100644 (file)
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -926,7 +926,6 @@ CONFIG_MAC80211_VERBOSE_DEBUG=y
 # CONFIG_MACVLAN is not set
 # CONFIG_MAC_PARTITION is not set
 CONFIG_MAGIC_SYSRQ=y
-# CONFIG_MALI_T6XX is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MAX517 is not set

diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 8d8faa6..07b2bcd 100644 (file)
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -184,6 +184,7 @@ CONFIG_DELL_WMI=m
 CONFIG_DEVPORT=y
 # CONFIG_DMADEVICES is not set
 CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_DMA_SHARED_BUFFER_USES_KDS=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
@@ -441,6 +442,7 @@ CONFIG_ISA_DMA_API=y
 # CONFIG_IXGBE is not set
 # CONFIG_IXGBEVF is not set
 CONFIG_JME=m
+CONFIG_KDS=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KEYBOARD_MKBP is not set
 CONFIG_KTIME_SCALAR=y

diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index b441a89..186b9eb 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -200,6 +200,7 @@ CONFIG_DEVPORT=y
 CONFIG_DIRECT_GBPAGES=y
 # CONFIG_DMADEVICES is not set
 CONFIG_DMA_SHARED_BUFFER=y
+CONFIG_DMA_SHARED_BUFFER_USES_KDS=y
 CONFIG_DMI=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
@@ -483,6 +484,7 @@ CONFIG_IWLWIFI_DEVICE_TESTMODE=y
 # CONFIG_IXGBE is not set
 # CONFIG_IXGBEVF is not set
 CONFIG_JME=m
+CONFIG_KDS=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KEYBOARD_MKBP is not set
 CONFIG_KEYS_COMPAT=y