From f060416fbdbfe5b6724983c9e7dfc380f827e5f3 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 17 Jul 2014 10:21:53 +0200 Subject: [PATCH] projects/Generic: dont build XHCI driver as module, and dont unload on suspend (for testing, please revert if this still causes problems with suspend/wakeup) Signed-off-by: Stephan Raue --- packages/sysutils/busybox/config/suspend-modules.conf | 2 +- projects/Generic/linux/linux.i386.conf | 2 +- projects/Generic/linux/linux.x86_64.conf | 2 +- projects/Generic/options | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sysutils/busybox/config/suspend-modules.conf b/packages/sysutils/busybox/config/suspend-modules.conf index 3c5501cc2f..6a0956732f 100644 --- a/packages/sysutils/busybox/config/suspend-modules.conf +++ b/packages/sysutils/busybox/config/suspend-modules.conf @@ -1 +1 @@ -SUSPEND_MODULES="xhci-hcd jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm ddbridge brcmfmac" +SUSPEND_MODULES="jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm ddbridge brcmfmac" diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index e59f424437..be2460aae1 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -3132,7 +3132,7 @@ CONFIG_USB_DEFAULT_PERSIST=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf index 6bc1653ac6..4701e07e25 100644 --- a/projects/Generic/linux/linux.x86_64.conf +++ b/projects/Generic/linux/linux.x86_64.conf @@ -3102,7 +3102,7 @@ CONFIG_USB_DEFAULT_PERSIST=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_XHCI_HCD=m +CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y diff --git a/projects/Generic/options b/projects/Generic/options index c246501d8e..81fc3a8086 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -314,7 +314,7 @@ LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428,serialVFD" # Modules to install in initramfs for early boot - INITRAMFS_MODULES="xhci-hcd" + INITRAMFS_MODULES="" # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported,