From c72ca9f8ccc287784731bbe7e0eec5b38def5ba8 Mon Sep 17 00:00:00 2001 From: Paolo Pisati Date: Fri, 4 Oct 2019 12:03:59 +0000 Subject: [PATCH] UBUNTU: [Config] arm64: snapdragon: CONFIG_USB_USBNET=y BugLink: https://bugs.launchpad.net/bugs/1846704 Signed-off-by: Paolo Pisati Acked-by: Seth Forshee Acked-by: Acked-by: Andrea Righi Signed-off-by: Seth Forshee --- debian.master/config/amd64/config.common.amd64 | 5 +++++ debian.master/config/arm64/config.flavour.generic | 5 +++++ debian.master/config/arm64/config.flavour.snapdragon | 5 +++++ debian.master/config/armhf/config.common.armhf | 5 +++++ debian.master/config/config.common.ubuntu | 5 ----- debian.master/config/i386/config.common.i386 | 5 +++++ debian.master/config/ppc64el/config.common.ppc64el | 5 +++++ debian.master/config/s390x/config.common.s390x | 1 + 8 files changed, 31 insertions(+), 5 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index c154b2b1b9d8..5bc37ee95b61 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -344,6 +344,7 @@ CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TQMX86=m CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m +CONFIG_MICROCHIP_PHY=m CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y @@ -630,13 +631,17 @@ CONFIG_USB_GADGET=m CONFIG_USB_HCD_BCMA=m CONFIG_USB_HCD_SSB=m CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_LAN78XX=m CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_DRIVERS=m CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_OTG is not set CONFIG_USB_ROLE_SWITCH=m CONFIG_USB_SUPPORT=y CONFIG_USB_ULPI_BUS=m +CONFIG_USB_USBNET=m CONFIG_USB_XHCI_PLATFORM=m CONFIG_VFIO=m CONFIG_VFIO_PCI=m diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic index 07d333d4e914..3170f98239df 100644 --- a/debian.master/config/arm64/config.flavour.generic +++ b/debian.master/config/arm64/config.flavour.generic @@ -9,6 +9,7 @@ CONFIG_LEDS_PWM=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_MFD_QCOM_RPM=m +CONFIG_MICROCHIP_PHY=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_MSM=m CONFIG_MMC_SDHCI_PLTFM=m @@ -66,10 +67,14 @@ CONFIG_USB_DWC3_QCOM=m CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_GADGET=m CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_LAN78XX=m CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_DRIVERS=m CONFIG_USB_OHCI_HCD_PLATFORM=m # CONFIG_USB_OTG is not set CONFIG_USB_ULPI_BUS=m +CONFIG_USB_USBNET=m CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_RCAR=m diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon index 1734cf3ecc6d..fe4ce78e88ea 100644 --- a/debian.master/config/arm64/config.flavour.snapdragon +++ b/debian.master/config/arm64/config.flavour.snapdragon @@ -9,6 +9,7 @@ CONFIG_LEDS_PWM=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_MFD_QCOM_RPM=y +CONFIG_MICROCHIP_PHY=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_MSM=y CONFIG_MMC_SDHCI_PLTFM=y @@ -66,10 +67,14 @@ CONFIG_USB_DWC3_QCOM=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_GADGET=y CONFIG_USB_HSIC_USB3503=y +CONFIG_USB_LAN78XX=y CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_DM9601=y CONFIG_USB_NET_DRIVERS=y CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_OTG=y CONFIG_USB_ULPI_BUS=y +CONFIG_USB_USBNET=y CONFIG_USB_XHCI_PLATFORM=y CONFIG_USB_XHCI_RCAR=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 2482558a7861..ba85ca16ad87 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -347,6 +347,7 @@ CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TQMX86=m CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m +CONFIG_MICROCHIP_PHY=m CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y @@ -664,12 +665,16 @@ CONFIG_USB_G_MULTI=m # CONFIG_USB_HCD_BCMA is not set # CONFIG_USB_HCD_SSB is not set CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_LAN78XX=m CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_DRIVERS=m # CONFIG_USB_OTG is not set CONFIG_USB_ROLE_SWITCH=y CONFIG_USB_SUPPORT=y CONFIG_USB_ULPI_BUS=m +CONFIG_USB_USBNET=m CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_RCAR=m CONFIG_VFIO=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index c5e7d1a2a262..90a2f9c0eb72 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5630,7 +5630,6 @@ CONFIG_MFD_WM8998=y # CONFIG_MGEODE_LX is not set CONFIG_MICREL_KS8995MA=m CONFIG_MICREL_PHY=m -CONFIG_MICROCHIP_PHY=m CONFIG_MICROCHIP_T1_PHY=m CONFIG_MICROCODE=y CONFIG_MICROCODE_AMD=y @@ -10572,7 +10571,6 @@ CONFIG_USB_KAWETH=m CONFIG_USB_KBD=m CONFIG_USB_KC2190=y CONFIG_USB_KEENE=m -CONFIG_USB_LAN78XX=m CONFIG_USB_LCD=m CONFIG_USB_LD=m CONFIG_USB_LEDS_TRIGGER_USBPORT=m @@ -10614,7 +10612,6 @@ CONFIG_USB_NET2272_DMA=y CONFIG_USB_NET2280=m CONFIG_USB_NET_AQC111=m CONFIG_USB_NET_AX88179_178A=m -CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_MBIM=m @@ -10623,7 +10620,6 @@ CONFIG_USB_NET_CDC_SUBSET=m CONFIG_USB_NET_CDC_SUBSET_ENABLE=m CONFIG_USB_NET_CH9200=m CONFIG_USB_NET_CX82310_ETH=m -CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_GL620A=m CONFIG_USB_NET_HUAWEI_CDC_NCM=m CONFIG_USB_NET_INT51X1=m @@ -10770,7 +10766,6 @@ CONFIG_USB_UHCI_PLATFORM=y CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC=y CONFIG_USB_ULPI=y CONFIG_USB_ULPI_VIEWPORT=y -CONFIG_USB_USBNET=m CONFIG_USB_USS720=m CONFIG_USB_U_AUDIO=m CONFIG_USB_U_ETHER=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 4f769b1bf5fc..4287168b81b9 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -338,6 +338,7 @@ CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TQMX86=m CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m +CONFIG_MICROCHIP_PHY=m CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y @@ -622,13 +623,17 @@ CONFIG_USB_GADGET=m CONFIG_USB_HCD_BCMA=m CONFIG_USB_HCD_SSB=m CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_LAN78XX=m CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_DRIVERS=m CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_OTG is not set CONFIG_USB_ROLE_SWITCH=m CONFIG_USB_SUPPORT=y CONFIG_USB_ULPI_BUS=m +CONFIG_USB_USBNET=m CONFIG_USB_XHCI_PLATFORM=m CONFIG_VFIO=m CONFIG_VFIO_PCI=m diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index d4bfc9edba7c..f72430177fbd 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -344,6 +344,7 @@ CONFIG_MFD_TPS65912_I2C=y CONFIG_MFD_TQMX86=m CONFIG_MFD_WL1273_CORE=m CONFIG_MFD_WM8994=m +CONFIG_MICROCHIP_PHY=m CONFIG_MII=m CONFIG_MINIX_FS=m CONFIG_MINIX_SUBPARTITION=y @@ -627,13 +628,17 @@ CONFIG_USB_GADGET=m CONFIG_USB_HCD_BCMA=m CONFIG_USB_HCD_SSB=m CONFIG_USB_HSIC_USB3503=m +CONFIG_USB_LAN78XX=m CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_DRIVERS=m CONFIG_USB_OHCI_HCD_PLATFORM=m # CONFIG_USB_OTG is not set CONFIG_USB_ROLE_SWITCH=m CONFIG_USB_SUPPORT=y CONFIG_USB_ULPI_BUS=m +CONFIG_USB_USBNET=m CONFIG_USB_XHCI_PLATFORM=m CONFIG_VFIO=y CONFIG_VFIO_PCI=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 06712b74faa1..465e4657c94e 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -324,6 +324,7 @@ CONFIG_MFD_CORE=m # CONFIG_MFD_TQMX86 is not set # CONFIG_MFD_WL1273_CORE is not set # CONFIG_MFD_WM8994 is not set +CONFIG_MICROCHIP_PHY=m # CONFIG_MINIX_FS is not set # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_MISC_ALCOR_PCI is not set -- 2.39.2