Author: blogic Date: 2014-12-11 19:35:41 +0100 (Thu, 11 Dec 2014) New Revision: 43627
Modified: trunk/package/kernel/linux/modules/usb.mk trunk/target/linux/imx6/profiles/100-generic.mk trunk/target/linux/imx6/profiles/110-wandboard.mk trunk/target/linux/imx6/profiles/120-gateworks.mk trunk/target/linux/mxs/modules.mk Log: kernel/modules: fix chipidea it should needs to depend on imx and mxs also remove duplicate kmod definition from mxs target Signed-off-by: John Crispin <[email protected]> Modified: trunk/package/kernel/linux/modules/usb.mk =================================================================== --- trunk/package/kernel/linux/modules/usb.mk 2014-12-11 18:28:44 UTC (rev 43626) +++ trunk/package/kernel/linux/modules/usb.mk 2014-12-11 18:35:41 UTC (rev 43627) @@ -1401,9 +1401,9 @@ $(eval $(call KernelPackage,usbip-server)) -define KernelPackage/usb-chipidea +define KernelPackage/usb-chipidea-imx TITLE:=Support for ChipIdea controllers - DEPENDS:=+kmod-usb2 +USB_GADGET_SUPPORT:kmod-usb-gadget + DEPENDS:=@TARGET_imx6||TARGET_mxs +kmod-usb2 +USB_GADGET_SUPPORT:kmod-usb-gadget KCONFIG:=\ CONFIG_USB_CHIPIDEA \ CONFIG_USB_CHIPIDEA_HOST=y \ @@ -1424,12 +1424,12 @@ endif $(call AddDepends/usb) endef - -define KernelPackage/usb-chipidea/description + +define KernelPackage/usb-chipidea-imx/description Kernel support for USB ChipIdea controllers endef -$(eval $(call KernelPackage,usb-chipidea,1)) +$(eval $(call KernelPackage,usb-chipidea-imx,1)) define KernelPackage/usb-mxs-phy Modified: trunk/target/linux/imx6/profiles/100-generic.mk =================================================================== --- trunk/target/linux/imx6/profiles/100-generic.mk 2014-12-11 18:28:44 UTC (rev 43626) +++ trunk/target/linux/imx6/profiles/100-generic.mk 2014-12-11 18:35:41 UTC (rev 43627) @@ -8,7 +8,7 @@ define Profile/Generic NAME:=Generic (default) PACKAGES:= \ - kmod-thermal-imx kmod-usb-chipidea kmod-usb-mxs-phy \ + kmod-thermal-imx kmod-usb-chipidea-imx kmod-usb-mxs-phy \ uboot-envtools endef Modified: trunk/target/linux/imx6/profiles/110-wandboard.mk =================================================================== --- trunk/target/linux/imx6/profiles/110-wandboard.mk 2014-12-11 18:28:44 UTC (rev 43626) +++ trunk/target/linux/imx6/profiles/110-wandboard.mk 2014-12-11 18:35:41 UTC (rev 43627) @@ -8,7 +8,7 @@ define Profile/IMX6DL_WANDBOARD NAME:=Wandboard Dual PACKAGES:= \ - kmod-thermal-imx kmod-usb-chipidea kmod-usb-mxs-phy \ + kmod-thermal-imx kmod-usb-chipidea-imx kmod-usb-mxs-phy \ uboot-envtools endef Modified: trunk/target/linux/imx6/profiles/120-gateworks.mk =================================================================== --- trunk/target/linux/imx6/profiles/120-gateworks.mk 2014-12-11 18:28:44 UTC (rev 43626) +++ trunk/target/linux/imx6/profiles/120-gateworks.mk 2014-12-11 18:35:41 UTC (rev 43627) @@ -8,7 +8,7 @@ define Profile/VENTANA NAME:=Gateworks Ventana family PACKAGES:= \ - kmod-thermal-imx kmod-sky2 kmod-usb-chipidea kmod-usb-mxs-phy \ + kmod-thermal-imx kmod-sky2 kmod-usb-chipidea-imx kmod-usb-mxs-phy \ kmod-sound-core kmod-sound-soc-imx kmod-sound-soc-imx-sgtl5000 \ kmod-can kmod-can-flexcan kmod-can-raw \ kmod-rtc-ds1672 kmod-gpio-pca953x kmod-hwmon-gsc kmod-eeprom-at24 \ Modified: trunk/target/linux/mxs/modules.mk =================================================================== --- trunk/target/linux/mxs/modules.mk 2014-12-11 18:28:44 UTC (rev 43626) +++ trunk/target/linux/mxs/modules.mk 2014-12-11 18:35:41 UTC (rev 43627) @@ -33,22 +33,6 @@ $(eval $(call KernelPackage,wdt-stmp3xxx)) -define KernelPackage/usb-chipidea-imx - TITLE:=Support for ChipIdea controllers on Freescale i.MX SoCs - DEPENDS:=+kmod-usb-chipidea @TARGET_mxs - FILES:= \ - $(LINUX_DIR)/drivers/usb/chipidea/ci_hdrc_imx.ko \ - $(LINUX_DIR)/drivers/usb/chipidea/usbmisc_imx.ko - AUTOLOAD:=$(call AutoLoad,52,usbmisc_imx ci_hdrc_imx,1) - $(call AddDepends/usb) -endef - -define KernelPackage/usb-chipidea-imx/description - Kernel support for USB ChipIdea controllers on Freescale i.MX SoCs -endef - -$(eval $(call KernelPackage,usb-chipidea-imx,1)) - define KernelPackage/sound-soc-mxs TITLE:=Freescale i.MX23/i.MX28 built-in SoC sound support KCONFIG:= \ @@ -63,7 +47,7 @@ DEPENDS:=@TARGET_mxs +kmod-sound-soc-core $(call AddDepends/sound) endef - + define KernelPackage/sound-soc-mxs/description Kernel support for Freescale i.MX23/i.MX28 built-in SoC audio endef _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
