CHROMIUM: config: Remove duplicate CONFIG_RT2xxx

Fix-up entires so global chromeos/config/base.config entries
are all we need.

Signed-off-by: Paul Stewart <pstew@chromium.org>
BUG=chromium-os:36732,chromium-os:35699
TEST=emerge-{parrot,daisy,x86-alex} chromeos-kernel:
Ensure prepareconfig does not fail due to CONFIG_RT* (it fails in
all of these platforms but for other reasons than my changes)

Change-Id: I32be7178c5cf255392d9b015797b0a17cba5918f
Reviewed-on: https://gerrit.chromium.org/gerrit/38839
Tested-by: Grant Grundler <grundler@chromium.org>
Reviewed-by: Grant Grundler <grundler@chromium.org>
Commit-Ready: Paul Stewart <pstew@chromium.org>

diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config
index ae0d27cb66e25fe45d96ad3efe22655ee9fd17ed..a8f3f1a966e646ca532d147399bff5052c7bf608 100644 (file)
--- a/chromeos/config/armel/chromeos-exynos5.flavour.config
+++ b/chromeos/config/armel/chromeos-exynos5.flavour.config
@@ -193,10 +193,8 @@ 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

diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 44f3919b1108d0cea27adc76c640604e5120c153..8d6fe245fb46c23b5688d428c88ee4dae69c6cdf 100644 (file)
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -1214,13 +1214,16 @@ CONFIG_RING_BUFFER=y
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPS=y
-CONFIG_RT2X00=m
 CONFIG_RT2800USB=m
-RT2800_LIB=m
-RT2X00_LIB_USB=m
-RT2X00_LIB_FIRMWARE=m
-RT2X00_LIB_CRYPTO=m
-RT2800USB_RT35XX=y
+CONFIG_RT2X00=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+# CONFIG_RT2800USB_RT53XX is not set
+# CONFIG_RT2800USB_UNKNOWN is not set
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_USB=m
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 # CONFIG_RTC_DRV_BQ32K is not set

diff --git a/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config b/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config
index b6ab21063351f0a3f85f8c8d7bcd0ef38824a0d6..16f9b29d92ca5840efc410db36435b602ca982ec 100644 (file)
--- a/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config
+++ b/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config
@@ -34,7 +34,6 @@ CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_RT2500USB is not set
-# CONFIG_RT2800USB is not set
 # CONFIG_RT73USB is not set
 # CONFIG_RTL8187 is not set
 # CONFIG_RTL8192CU is not set

diff --git a/chromeos/config/i386/chromiumos-i386.flavour.config b/chromeos/config/i386/chromiumos-i386.flavour.config
index 45dd25b55e8b57e8a3ed426085dc90446cb77f19..f428240b9c164a4c6c442e355799e13f758923c4 100644 (file)
--- a/chromeos/config/i386/chromiumos-i386.flavour.config
+++ b/chromeos/config/i386/chromiumos-i386.flavour.config
@@ -67,12 +67,6 @@ CONFIG_MXM_WMI=y
 # CONFIG_NEED_DMA_MAP_STATE is not set
 # CONFIG_NF_CONNTRACK_PROCFS is not set
 CONFIG_RT2500USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT33XX=y
-CONFIG_RT2800USB_RT35XX=y
-# CONFIG_RT2800USB_RT53XX is not set
-# CONFIG_RT2800USB_UNKNOWN is not set
-CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT73USB=m
 CONFIG_RTL8187=m
 CONFIG_RTL8187_LEDS=y

diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 2d05dd50f2832831bb5093b008684a67d92db21c..dfaeee8f5a202bbc9799d58374d92ea89f2ea7dd 100644 (file)
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -716,12 +716,9 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
 CONFIG_RT2800PCI_RT53XX=y
-CONFIG_RT2800_LIB=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_FIRMWARE=y
 CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_RT2X00_LIB_PCI=m
 # CONFIG_RT61PCI is not set

diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 07814065e6159a44631bf57c812574064c99ce10..78c068ea97e6ac7d562a0febf9bffa3bee5ebe90 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -733,12 +733,9 @@ CONFIG_REALTEK_AUTOPM=y
 # CONFIG_RT2500PCI is not set
 # CONFIG_RT2500USB is not set
 CONFIG_RT2800PCI=m
-CONFIG_RT2800_LIB=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_FIRMWARE=y
 CONFIG_RT2X00_LIB_LEDS=y
 CONFIG_RT2X00_LIB_PCI=m
 # CONFIG_RT61PCI is not set