aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2014-05-02 21:13:21 +0000
committerHauke Mehrtens <hauke@openwrt.org>2014-05-02 21:13:21 +0000
commitedb99c5d238ab4612eec06b4de702a309df7f62c (patch)
tree178dc7be900eb28384af5f3e67d670ed0aada120
parent4f16bf31c3d334152c89082169c3bab01931286b (diff)
downloadupstream-edb99c5d238ab4612eec06b4de702a309df7f62c.tar.gz
upstream-edb99c5d238ab4612eec06b4de702a309df7f62c.tar.bz2
upstream-edb99c5d238ab4612eec06b4de702a309df7f62c.zip
kernel: unify the two kmod-usb-mxs-phy packages
There are two packages with the name kmod-usb-mxs-phy in OpenWrt which causes warnings on every build. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40663 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/linux/modules/usb.mk2
-rw-r--r--target/linux/mxs/modules.mk16
2 files changed, 1 insertions, 17 deletions
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index f4fecd6f5c..37b3eb102a 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -1364,7 +1364,7 @@ $(eval $(call KernelPackage,usb-chipidea,1))
define KernelPackage/usb-mxs-phy
TITLE:=Support for Freescale MXS USB PHY
- DEPENDS:=@TARGET_imx6
+ DEPENDS:=@TARGET_imx6||TARGET_mxs +TARGET_mxs:kmod-usb-chipidea-imx
KCONFIG:=CONFIG_USB_MXS_PHY
FILES:=\
$(LINUX_DIR)/drivers/usb/phy/phy-mxs-usb.ko
diff --git a/target/linux/mxs/modules.mk b/target/linux/mxs/modules.mk
index cbb870b49d..0584a731bd 100644
--- a/target/linux/mxs/modules.mk
+++ b/target/linux/mxs/modules.mk
@@ -49,22 +49,6 @@ endef
$(eval $(call KernelPackage,usb-chipidea-imx,1))
-define KernelPackage/usb-mxs-phy
- TITLE:=Support for Freescale MXS USB PHY controllers
- DEPENDS:=+kmod-usb-chipidea-imx
- KCONFIG:= \
- CONFIG_USB_MXS_PHY
- FILES:=$(LINUX_DIR)/drivers/usb/phy/phy-mxs-usb.ko
- AUTOLOAD:=$(call AutoLoad,50,phy-mxs-usb,1)
- $(call AddDepends/usb)
-endef
-
-define KernelPackage/usb-mxs-phy/description
- Kernel support for Freescale MXS USB PHY controllers
-endef
-
-$(eval $(call KernelPackage,usb-mxs-phy,1))
-
define KernelPackage/sound-soc-mxs
TITLE:=Freescale i.MX23/i.MX28 built-in SoC sound support
KCONFIG:= \