Revert "CHROMIUM: Renormalize after iwl7000 Kconfig changes"
This reverts commit a2fcd62602b8ae6406adc900a653676f91b06d86.
Core31 update to the iwl7000 driver pulled in an iwl7000-specific
implementation of cfg80211, iwl7000_cfg80211.ko, which provides the
same functionality as cfg80211.ko and cannot co-exist with it.
cfg80211.ko was disabled on Intel systems.
Core35 restores the iwl7000 driver to using stock cfg80211, so re-add
the iwl7000->cfg80211 and related dependencies, make sure iwl7000 and other
wifi modules can co-exist on pineview configs.
CQ-DEPEND=CL:1006654
BUG=b:76340244
TEST=build and boot on meowth
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1012533
Commit-Ready: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Reviewed-by: Benson Leung <bleung@chromium.org>
(cherry picked from commit 2532e431e5aca37a83382eef5526685d6e20a062)
Change-Id: If655533c3b397a561a9f69c82dd0a0ea34dffc12
Reviewed-on: https://chromium-review.googlesource.com/1016014
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
Commit-Queue: Kirtika Ruchandani <kirtika@chromium.org>
Tested-by: Kirtika Ruchandani <kirtika@chromium.org>
Trybot-Ready: Kirtika Ruchandani <kirtika@chromium.org>
diff --git a/chromeos/config/arm64/chromiumos-arm64.flavour.config b/chromeos/config/arm64/chromiumos-arm64.flavour.config
index 98100ee..2f0bc53 100644
--- a/chromeos/config/arm64/chromiumos-arm64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-arm64.flavour.config
@@ -258,6 +258,7 @@
# CONFIG_IPW2200 is not set
# CONFIG_IWL3945 is not set
# CONFIG_IWL4965 is not set
+# CONFIG_IWL7000 is not set
# CONFIG_IWLWIFI is not set
# CONFIG_IXGB is not set
# CONFIG_IXGBE is not set
diff --git a/chromeos/config/arm64/chromiumos-rockchip64.flavour.config b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
index 6e5ff5c..9409ade 100644
--- a/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
+++ b/chromeos/config/arm64/chromiumos-rockchip64.flavour.config
@@ -180,6 +180,7 @@
# CONFIG_IPW2200 is not set
# CONFIG_IWL3945 is not set
# CONFIG_IWL4965 is not set
+# CONFIG_IWL7000 is not set
# CONFIG_IWLWIFI is not set
# CONFIG_IXGB is not set
# CONFIG_IXGBE is not set
diff --git a/chromeos/config/arm64/common.config b/chromeos/config/arm64/common.config
index 8547509..5ab539f 100644
--- a/chromeos/config/arm64/common.config
+++ b/chromeos/config/arm64/common.config
@@ -921,7 +921,6 @@
# CONFIG_USB_MV_U3D is not set
# CONFIG_USB_MV_UDC is not set
# CONFIG_USB_NET2272 is not set
-CONFIG_USB_NET_RNDIS_WLAN=m
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_HCD_PLATFORM=y
# CONFIG_USB_PHY is not set
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 4c05868..fbc44bc 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -623,6 +623,7 @@
# CONFIG_IT87_WDT is not set
CONFIG_ITCO_VENDOR_SUPPORT=y
CONFIG_ITCO_WDT=y
+# CONFIG_IWL7000 is not set
# CONFIG_IXGB is not set
# CONFIG_IXGBE is not set
# CONFIG_IXGBEVF is not set
diff --git a/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config b/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config
index 5d573e5..a6f75fc 100644
--- a/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config
+++ b/chromeos/config/x86_64/chromeos-amd-stoneyridge.flavour.config
@@ -71,6 +71,7 @@
# CONFIG_IPW2200 is not set
# CONFIG_IWL3945 is not set
# CONFIG_IWL4965 is not set
+# CONFIG_IWL7000 is not set
# CONFIG_IWLWIFI is not set
# CONFIG_MEDIA_CONTROLLER is not set
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
diff --git a/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config b/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
index a06c073..3e2ae79 100644
--- a/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
+++ b/chromeos/config/x86_64/chromeos-intel-pineview.flavour.config
@@ -75,6 +75,13 @@
# CONFIG_INTEL_SOC_PMIC_BXTWC is not set
CONFIG_INTEL_TELEMETRY=y
# CONFIG_INTEL_TURBO_MAX_3 is not set
+CONFIG_IWL7000=m
+CONFIG_IWL7000_DEBUGFS=y
+CONFIG_IWL7000_LEDS=y
+CONFIG_IWL7000_TESTMODE=y
+CONFIG_IWL7000_TRACING=y
+CONFIG_IWL7000_VENDOR_CMDS=y
+CONFIG_IWL7000_XVT=m
CONFIG_MEDIA_CONTROLLER=y
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_MFD_INTEL_LPSS=y
diff --git a/chromeos/config/x86_64/chromiumos-x86_64.flavour.config b/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
index eb0c8a9..23c10f8 100644
--- a/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
+++ b/chromeos/config/x86_64/chromiumos-x86_64.flavour.config
@@ -102,6 +102,13 @@
# CONFIG_INTEL_RDT is not set
CONFIG_INTEL_SOC_DTS_THERMAL=y
# CONFIG_INTEL_TURBO_MAX_3 is not set
+CONFIG_IWL7000=m
+CONFIG_IWL7000_DEBUGFS=y
+CONFIG_IWL7000_LEDS=y
+CONFIG_IWL7000_TESTMODE=y
+CONFIG_IWL7000_TRACING=y
+CONFIG_IWL7000_VENDOR_CMDS=y
+CONFIG_IWL7000_XVT=m
# CONFIG_MEDIA_CONTROLLER is not set
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
CONFIG_MFD_INTEL_LPSS=y