summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-11-04 12:19:14 +0100
committerJonas Gorski <jonas.gorski@gmail.com>2017-11-07 22:58:58 +0100
commita9a78a70cc0d4888bbf401533c980c152e0adcec (patch)
treeaa9c4cf1efb8328a87daad0b0513abf1a801a646
parentee59f8126fc3e75ee54151f21ddc4c4d829d4cd2 (diff)
downloadmtk-20170518-a9a78a70cc0d4888bbf401533c980c152e0adcec.zip
mtk-20170518-a9a78a70cc0d4888bbf401533c980c152e0adcec.tar.gz
mtk-20170518-a9a78a70cc0d4888bbf401533c980c152e0adcec.tar.bz2
ltq-adsl-mei: use the same file name for all variant
Due to limitations in the symvers treatment and the mei drivers exporting the same funtions, modpost might use the wrong mei driver to link against. Work around this by renaming them all to the same name, making it always the "right" module name even if the wrong file was used. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
-rw-r--r--package/kernel/lantiq/ltq-adsl-mei/Makefile4
-rw-r--r--package/kernel/lantiq/ltq-adsl-mei/src/Makefile8
-rw-r--r--package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c (renamed from package/kernel/lantiq/ltq-adsl-mei/src/lantiq_mei.c)0
3 files changed, 4 insertions, 8 deletions
diff --git a/package/kernel/lantiq/ltq-adsl-mei/Makefile b/package/kernel/lantiq/ltq-adsl-mei/Makefile
index 91c7984..08e5775 100644
--- a/package/kernel/lantiq/ltq-adsl-mei/Makefile
+++ b/package/kernel/lantiq/ltq-adsl-mei/Makefile
@@ -23,8 +23,8 @@ define KernelPackage/ltq-adsl-mei-template
URL:=http://www.lantiq.com/
VARIANT:=$(1)
DEPENDS:=@$(2)
- FILES:=$(PKG_BUILD_DIR)/ltq_mei_$(1).ko
- AUTOLOAD:=$(call AutoLoad,50,ltq_mei_$(1))
+ FILES:=$(PKG_BUILD_DIR)/drv_mei_cpe.ko
+ AUTOLOAD:=$(call AutoLoad,50,drv_mei_cpe)
endef
KernelPackage/ltq-adsl-danube-mei=$(call KernelPackage/ltq-adsl-mei-template,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy))
diff --git a/package/kernel/lantiq/ltq-adsl-mei/src/Makefile b/package/kernel/lantiq/ltq-adsl-mei/src/Makefile
index 2d8645f..9a3b891 100644
--- a/package/kernel/lantiq/ltq-adsl-mei/src/Makefile
+++ b/package/kernel/lantiq/ltq-adsl-mei/src/Makefile
@@ -1,17 +1,13 @@
ifeq ($(BUILD_VARIANT),danube)
CFLAGS_MODULE = -DCONFIG_DANUBE -DCONFIG_IFXMIPS_DSL_CPE_MEI
- obj-m = ltq_mei_danube.o
- ltq_mei_danube-objs = lantiq_mei.o
endif
ifeq ($(BUILD_VARIANT),ase)
CFLAGS_MODULE = -DCONFIG_AMAZON_SE -DCONFIG_IFXMIPS_DSL_CPE_MEI
- obj-m = ltq_mei_ase.o
- ltq_mei_ase-objs = lantiq_mei.o
endif
ifeq ($(BUILD_VARIANT),ar9)
CFLAGS_MODULE = -DCONFIG_AR9 -DCONFIG_IFXMIPS_DSL_CPE_MEI
- obj-m = ltq_mei_ar9.o
- ltq_mei_ar9-objs = lantiq_mei.o
endif
+
+obj-m = drv_mei_cpe.o
diff --git a/package/kernel/lantiq/ltq-adsl-mei/src/lantiq_mei.c b/package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c
index df04de7..df04de7 100644
--- a/package/kernel/lantiq/ltq-adsl-mei/src/lantiq_mei.c
+++ b/package/kernel/lantiq/ltq-adsl-mei/src/drv_mei_cpe.c