diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-01-10 10:13:30 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-10 12:10:20 +0100 |
| commit | 64be6fe9ca0b91456b60ca126446d03b26c6ab8d (patch) | |
| tree | a64275256f6afe138b866f4132b7dfbd67e88289 | |
| parent | 745069895775d1fbd8988a0825f24f6b503517b3 (diff) | |
| download | upstream-64be6fe9ca0b91456b60ca126446d03b26c6ab8d.tar.gz upstream-64be6fe9ca0b91456b60ca126446d03b26c6ab8d.tar.bz2 upstream-64be6fe9ca0b91456b60ca126446d03b26c6ab8d.zip | |
mxs: enable the chipidea usb driver in the kernel config instead of packaging it
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | package/kernel/linux/modules/usb.mk | 40 | ||||
| -rw-r--r-- | target/linux/mxs/config-4.4 | 15 |
2 files changed, 9 insertions, 46 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 7356602721..8af16ba9b3 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -1564,46 +1564,6 @@ endef $(eval $(call KernelPackage,usbip-server)) -define KernelPackage/usb-chipidea-imx - TITLE:=Support for ChipIdea controllers - DEPENDS:=@TARGET_mxs +kmod-usb2 +USB_GADGET_SUPPORT:kmod-usb-gadget - KCONFIG:=\ - CONFIG_USB_CHIPIDEA \ - CONFIG_USB_CHIPIDEA_HOST=y \ - CONFIG_USB_CHIPIDEA_UDC=y \ - CONFIG_USB_CHIPIDEA_DEBUG=y - FILES:=\ - $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc.ko \ - $(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_imx.ko) \ - $(if $(CONFIG_OF),$(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx.ko) - AUTOLOAD:=$(call AutoLoad,51,ci_hdrc $(if $(CONFIG_OF),ci_hdrc_imx usbmisc_imx),1) - $(call AddDepends/usb) -endef - -define KernelPackage/usb-chipidea-imx/description - Kernel support for USB ChipIdea controllers -endef - -$(eval $(call KernelPackage,usb-chipidea-imx,1)) - - -define KernelPackage/usb-mxs-phy - TITLE:=Support for Freescale MXS USB PHY - DEPENDS:=@TARGET_mxs +kmod-usb-chipidea-imx - KCONFIG:=CONFIG_USB_MXS_PHY - FILES:=\ - $(LINUX_DIR)/drivers/usb/phy/phy-mxs-usb.ko - AUTOLOAD:=$(call AutoLoad,52,phy-mxs-usb,1) - $(call AddDepends/usb) -endef - -define KernelPackage/usb-mxs-phy/description - Kernel support for Freescale MXS USB PHY -endef - -$(eval $(call KernelPackage,usb-mxs-phy,1)) - - define KernelPackage/usbmon TITLE:=USB traffic monitor KCONFIG:=CONFIG_USB_MON diff --git a/target/linux/mxs/config-4.4 b/target/linux/mxs/config-4.4 index 43e38ecb25..eadd10e1da 100644 --- a/target/linux/mxs/config-4.4 +++ b/target/linux/mxs/config-4.4 @@ -144,11 +144,6 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZ4=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_XZ=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_MEMBLOCK=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y @@ -283,11 +278,19 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_USB=y +CONFIG_USB_CHIPIDEA=y +# CONFIG_USB_CHIPIDEA_DEBUG is not set +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_OF=y +CONFIG_USB_CHIPIDEA_UDC=y CONFIG_USB_COMMON=y CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_HCD_PLATFORM is not set -# CONFIG_USB_MXS_PHY is not set +# CONFIG_USB_ETH is not set +CONFIG_USB_GADGET=y +CONFIG_USB_MXS_PHY=y CONFIG_USB_OTG=y +CONFIG_USB_PHY=y CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y CONFIG_VECTORS_BASE=0xffff0000 |