projects / openwrt / staging / wigyori.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 239ad94)
package/lantiq: make lantiq kernel modules work with xway_legacy
authorJohn Crispin <john@phrozen.org>
Mon, 13 Jun 2016 17:04:56 +0000 (19:04 +0200)
committerJohn Crispin <john@phrozen.org>
Mon, 13 Jun 2016 20:51:43 +0000 (22:51 +0200)
Signed-off-by: John Crispin <john@phrozen.org>
package/kernel/lantiq/ltq-adsl-fw/Makefile patch | blob | history
package/kernel/lantiq/ltq-adsl-mei/Makefile patch | blob | history
package/kernel/lantiq/ltq-adsl/Makefile patch | blob | history
package/kernel/lantiq/ltq-atm/Makefile patch | blob | history
package/kernel/lantiq/ltq-hcd/Makefile patch | blob | history
package/network/config/ltq-adsl-app/Makefile patch | blob | history

diff --git a/package/kernel/lantiq/ltq-adsl-fw/Makefile b/package/kernel/lantiq/ltq-adsl-fw/Makefile
index bbd21dd35af37b5554b5c94cd4f79a28605fc4e7..aad8cbd3022b5a31490ee52fe24cd123c9783a18 100644 (file)
--- a/package/kernel/lantiq/ltq-adsl-fw/Makefile
+++ b/package/kernel/lantiq/ltq-adsl-fw/Makefile
@@ -30,15 +30,15 @@ define Package/kmod-ltq-adsl-fw-template
   SOC:=$(2)
   ANNEX:=$(1)
   URL:=http://www.lantiq.com/
-  DEPENDS:=@TARGET_lantiq_$(3) +kmod-ltq-adsl-$(2)
+  DEPENDS:=@$(3) +kmod-ltq-adsl-$(2)
 endef
 
-Package/kmod-ltq-adsl-danube-fw-a=$(call Package/kmod-ltq-adsl-fw-template,a,danube,xway)
-Package/kmod-ltq-adsl-danube-fw-b=$(call Package/kmod-ltq-adsl-fw-template,b,danube,xway)
-Package/kmod-ltq-adsl-ar9-fw-a=$(call Package/kmod-ltq-adsl-fw-template,a,ar9,xway)
-Package/kmod-ltq-adsl-ar9-fw-b=$(call Package/kmod-ltq-adsl-fw-template,b,ar9,xway)
-Package/kmod-ltq-adsl-ase-fw-a=$(call Package/kmod-ltq-adsl-fw-template,a,ase,ase)
-Package/kmod-ltq-adsl-ase-fw-b=$(call Package/kmod-ltq-adsl-fw-template,b,ase,ase)
+Package/kmod-ltq-adsl-danube-fw-a=$(call Package/kmod-ltq-adsl-fw-template,a,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy))
+Package/kmod-ltq-adsl-danube-fw-b=$(call Package/kmod-ltq-adsl-fw-template,b,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy))
+Package/kmod-ltq-adsl-ar9-fw-a=$(call Package/kmod-ltq-adsl-fw-template,a,ar9,TARGET_lantiq_xway)
+Package/kmod-ltq-adsl-ar9-fw-b=$(call Package/kmod-ltq-adsl-fw-template,b,ar9,TARGET_lantiq_xway)
+Package/kmod-ltq-adsl-ase-fw-a=$(call Package/kmod-ltq-adsl-fw-template,a,ase,TARGET_lantiq_ase)
+Package/kmod-ltq-adsl-ase-fw-b=$(call Package/kmod-ltq-adsl-fw-template,b,ase,TARGET_lantiq_ase)
 
 define Build/Compile
 endef
diff --git a/package/kernel/lantiq/ltq-adsl-mei/Makefile b/package/kernel/lantiq/ltq-adsl-mei/Makefile
index c76c50631f56642a1b1bfa494321f643e135b920..6e78eb544f59b37768b3f0c548c4090c86d47f99 100644 (file)
--- a/package/kernel/lantiq/ltq-adsl-mei/Makefile
+++ b/package/kernel/lantiq/ltq-adsl-mei/Makefile
@@ -22,14 +22,14 @@ define KernelPackage/ltq-adsl-mei-template
   TITLE:=mei driver for $(1)
   URL:=http://www.lantiq.com/
   VARIANT:=$(1)
-  DEPENDS:=@TARGET_lantiq_$(2)
+  DEPENDS:=@$(2)
   FILES:=$(PKG_BUILD_DIR)/ltq_mei_$(1).ko
   AUTOLOAD:=$(call AutoLoad,50,ltq_mei_$(1))
 endef
 
-KernelPackage/ltq-adsl-danube-mei=$(call KernelPackage/ltq-adsl-mei-template,danube,xway)
-KernelPackage/ltq-adsl-ar9-mei=$(call KernelPackage/ltq-adsl-mei-template,ar9,xway)
-KernelPackage/ltq-adsl-ase-mei=$(call KernelPackage/ltq-adsl-mei-template,ase,ase)
+KernelPackage/ltq-adsl-danube-mei=$(call KernelPackage/ltq-adsl-mei-template,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy))
+KernelPackage/ltq-adsl-ar9-mei=$(call KernelPackage/ltq-adsl-mei-template,ar9,TARGET_lantiq_xway)
+KernelPackage/ltq-adsl-ase-mei=$(call KernelPackage/ltq-adsl-mei-template,ase,TARGET_lantiq_ase)
 
 define Build/Prepare
        $(INSTALL_DIR) $(PKG_BUILD_DIR)/
diff --git a/package/kernel/lantiq/ltq-adsl/Makefile b/package/kernel/lantiq/ltq-adsl/Makefile
index f781d523478d6d2feee3a065134cdc6ab59f4c52..19c19a1121028edd91a0fe67af0c97e68c273a24 100644 (file)
--- a/package/kernel/lantiq/ltq-adsl/Makefile
+++ b/package/kernel/lantiq/ltq-adsl/Makefile
@@ -30,14 +30,14 @@ define KernelPackage/ltq-adsl-template
   TITLE:=adsl driver for $(1)
   URL:=http://www.lantiq.com/
   VARIANT:=$(1)
-  DEPENDS:=@TARGET_lantiq_$(2) +kmod-ltq-adsl-$(1)-mei
+  DEPENDS:=@$(2) +kmod-ltq-adsl-$(1)-mei
   FILES:=$(PKG_BUILD_DIR)/src/drv_dsl_cpe_api.ko
   AUTOLOAD:=$(call AutoLoad,51,drv_dsl_cpe_api)
 endef
 
-KernelPackage/ltq-adsl-danube=$(call KernelPackage/ltq-adsl-template,danube,xway)
-KernelPackage/ltq-adsl-ar9=$(call KernelPackage/ltq-adsl-template,ar9,xway)
-KernelPackage/ltq-adsl-ase=$(call KernelPackage/ltq-adsl-template,ase,ase)
+KernelPackage/ltq-adsl-danube=$(call KernelPackage/ltq-adsl-template,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy))
+KernelPackage/ltq-adsl-ar9=$(call KernelPackage/ltq-adsl-template,ar9,TARGET_lantiq_xway)
+KernelPackage/ltq-adsl-ase=$(call KernelPackage/ltq-adsl-template,ase,TARGET_lantiq_ase)
 
 define KernelPackage/ltq-dsl/config
        source "$(SOURCE)/Config.in"
diff --git a/package/kernel/lantiq/ltq-atm/Makefile b/package/kernel/lantiq/ltq-atm/Makefile
index 4c1071504dc1795efd1eb39c472def7f8439c084..25ee0c6860551997a8c1ccfad5a8137bb5b02e64 100644 (file)
--- a/package/kernel/lantiq/ltq-atm/Makefile
+++ b/package/kernel/lantiq/ltq-atm/Makefile
@@ -21,14 +21,15 @@ define KernelPackage/ltq-atm-template
   TITLE:=atm driver for $(1)
   URL:=http://www.lantiq.com/
   VARIANT:=$(1)
-  DEPENDS:=@TARGET_lantiq_$(2) +kmod-atm +br2684ctl
+  DEPENDS:=@$(2) +kmod-atm +br2684ctl
   FILES:=$(PKG_BUILD_DIR)/ltq_atm_$(1).ko
   AUTOLOAD:=$(call AutoProbe,ltq_atm_$(1))
 endef
 
-KernelPackage/ltq-atm-danube=$(call KernelPackage/ltq-atm-template,danube,xway)
-KernelPackage/ltq-atm-ar9=$(call KernelPackage/ltq-atm-template,ar9,xway)
-KernelPackage/ltq-atm-ase=$(call KernelPackage/ltq-atm-template,ase,ase)
+KernelPackage/ltq-atm-danube=$(call KernelPackage/ltq-atm-template,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy))
+KernelPackage/ltq-atm-ar9=$(call KernelPackage/ltq-atm-template,ar9,TARGET_lantiq_xway)
+KernelPackage/ltq-atm-ase=$(call KernelPackage/ltq-atm-template,ase,TARGET_lantiq_ase)
+
 define KernelPackage/ltq-atm-vr9
   $(call KernelPackage/ltq-atm-template,vr9,xrx200)
   AUTOLOAD:=
diff --git a/package/kernel/lantiq/ltq-hcd/Makefile b/package/kernel/lantiq/ltq-hcd/Makefile
index f774e6f8977fc45554b56f37523bf4c80abd372a..5f3767206d67c23ddad1016e2f5d0f3a5745fead 100644 (file)
--- a/package/kernel/lantiq/ltq-hcd/Makefile
+++ b/package/kernel/lantiq/ltq-hcd/Makefile
@@ -23,14 +23,14 @@ define KernelPackage/ltq-hcd-template
   TITLE:=USB driver for $(1)
   URL:=http://www.lantiq.com/
   VARIANT:=$(1)
-  DEPENDS:=@TARGET_lantiq_$(2) +kmod-usb-core
+  DEPENDS:=@$(2) +kmod-usb-core
   FILES:=$(PKG_BUILD_DIR)/ltq_hcd_$(1).ko
   AUTOLOAD:=$(call AutoProbe,ltq_hcd_$(1),1)
 endef
 
-KernelPackage/ltq-hcd-ase=$(call KernelPackage/ltq-hcd-template,ase,ase)
-KernelPackage/ltq-hcd-danube=$(call KernelPackage/ltq-hcd-template,danube,xway)
-KernelPackage/ltq-hcd-ar9=$(call KernelPackage/ltq-hcd-template,ar9,xway)
+KernelPackage/ltq-hcd-ase=$(call KernelPackage/ltq-hcd-template,ase,TARGET_lantiq_ase)
+KernelPackage/ltq-hcd-danube=$(call KernelPackage/ltq-hcd-template,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy))
+KernelPackage/ltq-hcd-ar9=$(call KernelPackage/ltq-hcd-template,ar9,TARGET_lantiq_xway)
 
 define Build/Prepare
        $(INSTALL_DIR) $(PKG_BUILD_DIR)
diff --git a/package/network/config/ltq-adsl-app/Makefile b/package/network/config/ltq-adsl-app/Makefile
index 110e004fd54702ee48ea084f525278df20ad3433..22aed39f72bfc901bbb67bfa4b61fc0bde8b4cdc 100644 (file)
--- a/package/network/config/ltq-adsl-app/Makefile
+++ b/package/network/config/ltq-adsl-app/Makefile
@@ -24,7 +24,7 @@ PKG_CONFIG_DEPENDS:=\
        CONFIG_LTQ_DSL_ENABLE_SOAP \
        CONFIG_LTQ_DSL_ENABLE_DSL_EVENT_POLLING
 
-PKG_BUILD_DEPENDS:=TARGET_lantiq_xway:kmod-ltq-adsl-danube TARGET_lantiq_ase:kmod-ltq-adsl-ase
+PKG_BUILD_DEPENDS:=TARGET_lantiq_xway:kmod-ltq-adsl-danube TARGET_lantiq_xway_legacy:kmod-ltq-adsl-danube TARGET_lantiq_ase:kmod-ltq-adsl-ase
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,7 +33,7 @@ define Package/ltq-adsl-app
   CATEGORY:=Network
   TITLE:=Lantiq DSL userland tool
   URL:=http://www.lantiq.com/
-  DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_ase) +libpthread
+  DEPENDS:=@(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy||TARGET_lantiq_ase) +libpthread
   MENU:=1
 endef
 
Staging tree of Zoltan Herpai