From patchwork Thu Oct 18 16:32:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] UBUNTU: [Config] omap: disable USB_[EHCI|OHCI]_HCD_PLATFORM Date: Thu, 18 Oct 2012 06:32:34 -0000 From: Paolo Pisati X-Patchwork-Id: 192384 Message-Id: <1350577954-24333-3-git-send-email-paolo.pisati@canonical.com> To: kernel-team@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1061599 Signed-off-by: Paolo Pisati Acked-by: Andy Whitcroft Signed-off-by: Tim Gardner --- debian.master/config/amd64/config.common.amd64 | 4 ++++ debian.master/config/armel/config.common.armel | 4 ++++ debian.master/config/armhf/config.common.armhf | 2 ++ debian.master/config/armhf/config.flavour.highbank | 2 ++ debian.master/config/armhf/config.flavour.omap | 2 ++ debian.master/config/config.common.ubuntu | 4 ---- debian.master/config/i386/config.common.i386 | 4 ++++ debian.master/config/powerpc/config.common.powerpc | 4 ++++ debian.master/config/ppc64/config.common.ppc64 | 4 ++++ 9 files changed, 26 insertions(+), 4 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index b331bbb..39d2cdd 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -241,12 +241,16 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_GADGET=m # CONFIG_USB_G_MULTI is not set +CONFIG_USB_HCD_BCMA=m +CONFIG_USB_HCD_SSB=m CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_VERSION_SIGNATURE="" CONFIG_VFAT_FS=y CONFIG_VFIO=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index fc75257..1b1610f 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -248,12 +248,16 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y # CONFIG_USB_ARCH_HAS_XHCI is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set CONFIG_USB_GADGET=y CONFIG_USB_G_MULTI=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set CONFIG_USB_MUSB_HDRC=y # CONFIG_USB_MUSB_TUSB6010 is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +# CONFIG_USB_OHCI_HCD_PLATFORM is not set CONFIG_VERSION_SIGNATURE="" CONFIG_VFAT_FS=y # CONFIG_VFIO is not set diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 5cdfb01..5bf0b85 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -85,9 +85,11 @@ CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TWL4030_CORE=y CONFIG_TWL4030_USB=y # CONFIG_USB_ARCH_HAS_XHCI is not set +# CONFIG_USB_EHCI_HCD_PLATFORM is not set # CONFIG_USB_MUSB_TUSB6010 is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +# CONFIG_USB_OHCI_HCD_PLATFORM is not set CONFIG_VFAT_FS=y # CONFIG_VFIO is not set # CONFIG_VGASTATE is not set diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index db28aa8..d111af3 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -166,6 +166,8 @@ CONFIG_SYS_HYPERVISOR=y # CONFIG_USB_ARCH_HAS_OHCI is not set CONFIG_USB_GADGET=m # CONFIG_USB_G_MULTI is not set +CONFIG_USB_HCD_BCMA=m +CONFIG_USB_HCD_SSB=m CONFIG_USB_MUSB_HDRC=m CONFIG_VERSION_SIGNATURE="Ubuntu 3.2.0-1800.1-highbank 3.2.9" # CONFIG_VIRT_DRIVERS is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 107b24e..5de66c8 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -166,6 +166,8 @@ CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_GADGET=y CONFIG_USB_G_MULTI=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set CONFIG_USB_MUSB_HDRC=y CONFIG_VERSION_SIGNATURE="" CONFIG_VIRT_DRIVERS=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index b56141d..36321f8 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -5966,7 +5966,6 @@ CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_OMAP=y -CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_EHCI_HCD_PPC_OF=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y @@ -6052,8 +6051,6 @@ CONFIG_USB_G_NOKIA=m CONFIG_USB_G_PRINTER=m CONFIG_USB_G_SERIAL=m CONFIG_USB_G_WEBCAM=m -CONFIG_USB_HCD_BCMA=m -CONFIG_USB_HCD_SSB=m CONFIG_USB_HID=m CONFIG_USB_HIDDEV=y CONFIG_USB_HSO=m @@ -6115,7 +6112,6 @@ CONFIG_USB_NET_ZAURUS=m CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_OMAP3=y CONFIG_USB_OHCI_HCD_PCI=y -CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD_PPC_OF=y CONFIG_USB_OHCI_HCD_PPC_OF_BE=y CONFIG_USB_OHCI_LITTLE_ENDIAN=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 272565a..c90fe80 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -240,12 +240,16 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_GADGET=m # CONFIG_USB_G_MULTI is not set +CONFIG_USB_HCD_BCMA=m +CONFIG_USB_HCD_SSB=m CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set +CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_VERSION_SIGNATURE="" CONFIG_VFAT_FS=y CONFIG_VFIO=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index d074b8a..409c99b 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -234,12 +234,16 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_GADGET=m # CONFIG_USB_G_MULTI is not set +CONFIG_USB_HCD_BCMA=m +CONFIG_USB_HCD_SSB=m CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y +CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set CONFIG_VERSION_SIGNATURE="" CONFIG_VFAT_FS=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 7fa1bb1..222d59d 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -270,12 +270,16 @@ CONFIG_UNUSED_SYMBOLS=y CONFIG_USB_ARCH_HAS_EHCI=y CONFIG_USB_ARCH_HAS_OHCI=y CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_GADGET=m # CONFIG_USB_G_MULTI is not set +CONFIG_USB_HCD_BCMA=m +CONFIG_USB_HCD_SSB=m CONFIG_USB_MUSB_HDRC=m CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y +CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD_PPC_OF_LE=y CONFIG_VERSION_SIGNATURE="" CONFIG_VFAT_FS=m