From 1f60f2c0c22df468f6ba5cd09b9b5ae4ce01cd41 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 2 Oct 2020 11:50:44 -0500
Subject: New mtac-mfser recipe supporting both Atmel and TI

---
 recipes-bsp/multitech/mtac-mfser_1.1.0.bb | 48 ----------------------------
 recipes-bsp/multitech/mtac-mfser_1.1.1.bb | 52 +++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 48 deletions(-)
 delete mode 100644 recipes-bsp/multitech/mtac-mfser_1.1.0.bb
 create mode 100644 recipes-bsp/multitech/mtac-mfser_1.1.1.bb

diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.0.bb b/recipes-bsp/multitech/mtac-mfser_1.1.0.bb
deleted file mode 100644
index d83b8e9..0000000
--- a/recipes-bsp/multitech/mtac-mfser_1.1.0.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "MTAC Multi-Function Serial Card"
-HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-mfser/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-do_fetch[depends]+="virtual/kernel:do_shared_workdir"
-DEPENDS = "virtual/kernel mtac mts-io"
-RDEPENDS_${PN} = "kernel-module-mtac"
-INC_PR = "r0"
-COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
-
-SRCREV = "${PV}"
-
-PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
-
-SRC_URI = " \
-    git://git.multitech.net/mtac-mfser.git;protocol=git \
-"
-S = "${WORKDIR}/git"
-
-inherit module
-
-EXTRA_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
-                EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers' \
-                KBUILD_VERBOSE=1 \
-                M=${S} \
-                modules \
-                "
-
-do_compile () {
-    bbnote make   "$@"
-    make   "$@"
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake
-}
-
-PACKAGES = "kernel-module-${PN}"
-
-FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_mfser.ko"
-
-PARALLEL_MAKE = ""
-
-fakeroot do_install () {
-    install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-    # use cp instead of install so the driver doesn't get stripped
-    cp ${S}/mtac_mfser.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-}
diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb
new file mode 100644
index 0000000..5105e95
--- /dev/null
+++ b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb
@@ -0,0 +1,52 @@
+DESCRIPTION = "MTAC Multi-Function Serial Card"
+HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-mfser/"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+do_fetch[depends]+="virtual/kernel:do_shared_workdir"
+DEPENDS = "virtual/kernel mtac mts-io"
+RDEPENDS_${PN} = "kernel-module-mtac"
+INC_PR = "r0"
+COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
+
+SRCREV = "${PV}"
+
+PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
+
+SRC_URI = " \
+    git://git.multitech.net/mtac-mfser.git;protocol=git \
+"
+S = "${WORKDIR}/git"
+
+inherit module
+
+COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
+                KBUILD_VERBOSE=1 \
+                M=${S} \
+                modules \
+                "
+
+EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
+                                    -D SAM9G25'"
+EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
+                                    -D TI43X'"
+
+do_compile () {
+    bbnote make   "$@"
+    make   "$@"
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    oe_runmake
+}
+
+PACKAGES = "kernel-module-${PN}"
+
+FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_mfser.ko"
+
+PARALLEL_MAKE = ""
+
+fakeroot do_install () {
+    install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+    # use cp instead of install so the driver doesn't get stripped
+    cp ${S}/mtac_mfser.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+}
-- 
cgit v1.2.3