From dcc6fd46a25c2825e1c8cb8c10f6230c58b4139f Mon Sep 17 00:00:00 2001 From: Paul Stewart Date: Wed, 28 Nov 2012 12:32:46 -0800 Subject: [PATCH] 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 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 Reviewed-by: Grant Grundler Commit-Ready: Paul Stewart --- .../config/armel/chromeos-exynos5.flavour.config | 2 -- chromeos/config/base.config | 15 +++++++++------ .../i386/chromeos-pinetrail-i386.flavour.config | 1 - .../config/i386/chromiumos-i386.flavour.config | 6 ------ chromeos/config/i386/common.config | 3 --- chromeos/config/x86_64/common.config | 3 --- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/chromeos/config/armel/chromeos-exynos5.flavour.config b/chromeos/config/armel/chromeos-exynos5.flavour.config index ae0d27cb66e2..a8f3f1a966e6 100644 --- 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 44f3919b1108..8d6fe245fb46 100644 --- 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 b6ab21063351..16f9b29d92ca 100644 --- 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 45dd25b55e8b..f428240b9c16 100644 --- 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 2d05dd50f283..dfaeee8f5a20 100644 --- 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 07814065e615..78c068ea97e6 100644 --- 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 -- 2.20.1