CHROMIUM: config: enable usb net drivers (dm9601/net1080/rtl8150) for all targets

Some configs had these drivers enabled while others did not.  Update the
common arch configs to all enable these drivers.

BUG=chromium-os:35943
TEST=`emerge-daisy chromeos-kernel` included these three drivers
TEST=`emerge-stumpy chromeos-kernel` included these three drivers
TEST=`emerge-x86-alex chromeos-kernel` included these three drivers

Change-Id: I9615109a5b17af293855595ba8f06f397db360c4
Signed-off-by: Mike Frysinger <vapier@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/37296
Reviewed-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Grant Grundler <grundler@chromium.org>

diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index f6fbdfbaa9a7e40c7838672e25765d486e9394bb..d5607b6ee70cf1e2404422e64a9c1f524cf82294 100644 (file)
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -310,9 +310,6 @@ CONFIG_TCG_TIS_I2C=y
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_USB_HSO is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_STORAGE_REALTEK is not set
 CONFIG_USE_OF=y
 CONFIG_VECTORS_BASE=0xffff0000

diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 858da45afc98308d557189eaa3a0228d91244923..e63ed8194cc67f9c2ef403488c8bed9e4e36174b 100644 (file)
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -1659,11 +1659,13 @@ CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_NCM=m
 # CONFIG_USB_NET_CDC_SUBSET is not set
 # CONFIG_USB_NET_CX82310_ETH is not set
+CONFIG_USB_NET_DM9601=m
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_GOBI is not set
 # CONFIG_USB_NET_INT51X1 is not set
 # CONFIG_USB_NET_KALMIA is not set
 CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_NET1080=m
 # CONFIG_USB_NET_PLUSB is not set
 # CONFIG_USB_NET_QMI_WWAN is not set
 CONFIG_USB_NET_RNDIS_HOST=m
@@ -1680,6 +1682,7 @@ CONFIG_USB_PEGASUS=m
 # CONFIG_USB_PWC is not set
 # CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_RTL8150=m
 # CONFIG_USB_S2255 is not set
 CONFIG_USB_SERIAL=y
 # CONFIG_USB_SERIAL_AIRCABLE is not set

diff --git a/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config b/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config
index 4054ceeb513e2649a0e6836cf43ec613a975981e..b6ab21063351f0a3f85f8c8d7bcd0ef38824a0d6 100644 (file)
--- a/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config
+++ b/chromeos/config/i386/chromeos-pinetrail-i386.flavour.config
@@ -42,7 +42,6 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_RTL8192SE is not set
 # CONFIG_RTLLIB is not set
 CONFIG_RTLWIFI_DEBUG=y
-# CONFIG_USB_RTL8150 is not set
 CONFIG_V4L_PCI_DRIVERS=y
 # CONFIG_VIDEO_BT848 is not set
 # CONFIG_VIDEO_CX88 is not set

diff --git a/chromeos/config/i386/chromiumos-i386.flavour.config b/chromeos/config/i386/chromiumos-i386.flavour.config
index 2442324070ac9ac0c459c2c3c33627f181054a4f..45dd25b55e8b57e8a3ed426085dc90446cb77f19 100644 (file)
--- a/chromeos/config/i386/chromiumos-i386.flavour.config
+++ b/chromeos/config/i386/chromiumos-i386.flavour.config
@@ -85,7 +85,6 @@ CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
 # CONFIG_RTLWIFI_DEBUG is not set
-CONFIG_USB_RTL8150=m
 # CONFIG_V4L_PCI_DRIVERS is not set
 CONFIG_X86_POWERNOW_K6=y
 CONFIG_X86_POWERNOW_K7=y

diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 7b2065f8ca5dd630413a2d42fac76696a14ffb66..2d05dd50f2832831bb5093b008684a67d92db21c 100644 (file)
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -920,8 +920,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 # CONFIG_USB_DWC3 is not set
 # CONFIG_USB_HSO is not set
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_NET1080=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=y

diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 56851f7aa74f3ebfa14a03622c280fb8e1617c0e..85e77d7eef96570fdc2f80df82bac8eee342a299 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -948,14 +948,11 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 # CONFIG_USB_DWC3 is not set
 CONFIG_USB_HSO=y
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_NET1080=m
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-# CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SERIAL_FTDI_SIO is not set
 CONFIG_USB_STORAGE_REALTEK=y
 CONFIG_USB_UHCI_HCD=y