diff options
| -rw-r--r-- | package/kernel/linux/modules/usb.mk | 25 | ||||
| -rw-r--r-- | target/linux/mpc85xx/config-4.4 | 15 | ||||
| -rw-r--r-- | target/linux/mpc85xx/profiles/00-default.mk | 1 | ||||
| -rw-r--r-- | target/linux/mpc85xx/profiles/tp-link.mk | 4 |
4 files changed, 18 insertions, 27 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 1d71c02e30..c226ae8b85 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -400,23 +400,6 @@ endef $(eval $(call KernelPackage,usb-ohci-pci)) -define KernelPackage/usb2-fsl - TITLE:=Support for Freescale USB2 controllers - DEPENDS:=@TARGET_mpc85xx - HIDDEN:=1 - KCONFIG:=CONFIG_USB_FSL_MPH_DR_OF - FILES:=$(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko - AUTOLOAD:=$(call AutoLoad,39,fsl-mph-dr-of,1) - $(call AddDepends/usb) -endef - -define KernelPackage/usb2-fsl/description - Kernel support for Freescale USB2 (EHCI) controllers -endef - -$(eval $(call KernelPackage,usb2-fsl)) - - define KernelPackage/usb2-omap TITLE:=Support for USB2 for OMAP DEPENDS:=@TARGET_omap +kmod-usb-phy-nop +kmod-usb-phy-am335x +kmod-usb2 @@ -464,8 +447,7 @@ define KernelPackage/usb2 +TARGET_brcm47xx:kmod-usb-bcma \ +TARGET_brcm47xx:kmod-usb-ssb \ +TARGET_bcm53xx:kmod-usb-bcma \ - +TARGET_bcm53xx:kmod-phy-bcm-ns-usb2 \ - +TARGET_mpc85xx:kmod-usb2-fsl + +TARGET_bcm53xx:kmod-phy-bcm-ns-usb2 KCONFIG:=\ CONFIG_USB_EHCI_HCD \ CONFIG_USB_EHCI_ATH79=y \ @@ -486,10 +468,7 @@ define KernelPackage/usb2 ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko),) FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-atmel.ko endif - ifneq ($(wildcard $(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko),) - FILES+=$(LINUX_DIR)/drivers/usb/host/ehci-fsl.ko - endif - AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion ehci-atmel ehci-fsl,1) + AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform ehci-orion ehci-atmel,1) $(call AddDepends/usb) endef diff --git a/target/linux/mpc85xx/config-4.4 b/target/linux/mpc85xx/config-4.4 index 1afedf0f79..2f08e6db30 100644 --- a/target/linux/mpc85xx/config-4.4 +++ b/target/linux/mpc85xx/config-4.4 @@ -80,8 +80,10 @@ CONFIG_EDAC_SUPPORT=y CONFIG_ENABLE_MUST_CHECK=y # CONFIG_EPAPR_BOOT is not set CONFIG_ETHERNET_PACKET_MANGLE=y +# CONFIG_FHCI_DEBUG is not set CONFIG_FSL_BOOKE=y CONFIG_FSL_EMB_PERFMON=y +CONFIG_FSL_GTM=y CONFIG_FSL_LBC=y CONFIG_FSL_PCI=y CONFIG_FSL_PQ_MDIO=y @@ -196,6 +198,7 @@ CONFIG_MTD_SPI_NOR=y # CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK is not set CONFIG_NEED_PER_CPU_KM=y CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NLS=y # CONFIG_NONSTATIC_KERNEL is not set CONFIG_NO_BOOTMEM=y CONFIG_NR_IRQS=512 @@ -277,6 +280,7 @@ CONFIG_PPC_WERROR=y CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PTP_1588_CLOCK_GIANFAR is not set CONFIG_QE_GPIO=y +CONFIG_QE_USB=y CONFIG_QUICC_ENGINE=y CONFIG_RAS=y # CONFIG_RCU_STALL_COMMON is not set @@ -319,11 +323,22 @@ CONFIG_UCC=y CONFIG_UCC_FAST=y CONFIG_UCC_GETH=y # CONFIG_UGETH_TX_ON_DEMAND is not set +CONFIG_USB=y +CONFIG_USB_COMMON=y +CONFIG_USB_EHCI_FSL=y +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +CONFIG_USB_EHCI_HCD_PPC_OF=y +CONFIG_USB_EHCI_PCI=y +CONFIG_USB_FHCI_HCD=y +CONFIG_USB_FSL_MPH_DR_OF=y CONFIG_USB_SUPPORT=y +# CONFIG_USB_UHCI_HCD is not set CONFIG_VDSO32=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_WATCHDOG_CORE=y CONFIG_WORD_SIZE=32 # CONFIG_XES_MPC85xx is not set +# CONFIG_XPS_USB_HCD_XILINX is not set CONFIG_XZ_DEC_BCJ=y CONFIG_XZ_DEC_POWERPC=y diff --git a/target/linux/mpc85xx/profiles/00-default.mk b/target/linux/mpc85xx/profiles/00-default.mk index a0b255892b..7dcb8faaa3 100644 --- a/target/linux/mpc85xx/profiles/00-default.mk +++ b/target/linux/mpc85xx/profiles/00-default.mk @@ -7,7 +7,6 @@ define Profile/Default NAME:=Default Profile (all drivers) - PACKAGES:=kmod-usb-core kmod-usb2 kmod-usb2-fsl endef define Profile/Default/Description diff --git a/target/linux/mpc85xx/profiles/tp-link.mk b/target/linux/mpc85xx/profiles/tp-link.mk index 47ddacda0a..18a7cddd83 100644 --- a/target/linux/mpc85xx/profiles/tp-link.mk +++ b/target/linux/mpc85xx/profiles/tp-link.mk @@ -7,9 +7,7 @@ define Profile/TLWDR4900 NAME:=TP-Link TL-WDR4900 - PACKAGES:=\ - kmod-usb-core kmod-usb2 kmod-usb2-fsl \ - kmod-ath9k wpad-mini + PACKAGES:=kmod-ath9k wpad-mini endef define Profile/TLWDR4900/Description |