From 5ec3c59dd16c42c4bade24ee75773a8764fcb01e Mon Sep 17 00:00:00 2001 From: Harsh Sharma Date: Mon, 25 Oct 2021 14:53:26 -0500 Subject: Revert "Added support for mtac-003" This reverts commit d390864f59232db90b80e5e65705c03687db2f1a. --- recipes-bsp/multitech/mt-dt-overlay/init | 44 +++++-------- recipes-bsp/multitech/mt-dt-overlay_1.0.4.bb | 93 ++++++++++++++++++++++++++++ recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb | 93 ---------------------------- recipes-bsp/multitech/mtac-gpiob_1.1.4.bb | 4 +- recipes-bsp/multitech/mtac_4.0.7.bb | 69 +++++++++++++++++++++ recipes-bsp/multitech/mtac_4.0.9.bb | 69 --------------------- recipes-bsp/multitech/mts-io/mts-io.init | 11 +++- 7 files changed, 186 insertions(+), 197 deletions(-) create mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.0.4.bb delete mode 100644 recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb create mode 100644 recipes-bsp/multitech/mtac_4.0.7.bb delete mode 100644 recipes-bsp/multitech/mtac_4.0.9.bb diff --git a/recipes-bsp/multitech/mt-dt-overlay/init b/recipes-bsp/multitech/mt-dt-overlay/init index 5bd8523..5114e4e 100755 --- a/recipes-bsp/multitech/mt-dt-overlay/init +++ b/recipes-bsp/multitech/mt-dt-overlay/init @@ -5,39 +5,24 @@ # device tree. sysdir=/sys/devices/platform/mts-io +i2c=/sys/bus/i2c/devices/ DEVTREE="/sys/kernel/config/device-tree/overlays/" SYSFS="/usr/sbin/mts-io-sysfs" -I2CDIR="/sys/bus/i2c/devices" -AP1_EEPROM=$I2CDIR"/1-0050/eeprom" -AP2_EEPROM=$I2CDIR"/1-0052/eeprom" install_dtbo_dir() { - if ! [[ -d ${DEVTREE} ]] ; then - mount configfs - fi - if ([ -f "$AP1_EEPROM" ] && grep -q GPIOB "$AP1_EEPROM") || ([ -f "$AP2_EEPROM" ] && grep -q GPIOB "$AP2_EEPROM"); then - for f in *gpiob.dtbo ; do - if ! [[ -f $f ]] ; then - continue - fi - # f2 is the extracted device name - base=$(basename $f .dtbo) - /bin/mkdir ${DEVTREE}/$base || true - /bin/cat $f >${DEVTREE}/$base/dtbo - done - modprobe mt_ac_gpiob - else - for f in *lora.dtbo ; do - if ! [[ -f $f ]] ; then - continue - fi - # f2 is the extracted device name - base=$(basename $f .dtbo) - /bin/mkdir ${DEVTREE}/$base || true - /bin/cat $f >${DEVTREE}/$base/dtbo - done - fi + for f in *.dtbo ; do + if ! [[ -f $f ]] ; then + continue + fi + if ! [[ -d ${DEVTREE} ]] ; then + mount configfs + fi + # f2 is the extracted device name + base=$(basename $f .dtbo) + /bin/mkdir ${DEVTREE}/$base || true + /bin/cat $f >${DEVTREE}/$base/dtbo + done } # Device tree format: @@ -72,7 +57,7 @@ setdevtree() { done if [[ $best == -1 ]] ; then # No overlay found - exit 0 + exit 0 fi cd $best install_dtbo_dir @@ -108,4 +93,3 @@ case $1 in exit 2 ;; esac - diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.0.4.bb b/recipes-bsp/multitech/mt-dt-overlay_1.0.4.bb new file mode 100644 index 0000000..97635c9 --- /dev/null +++ b/recipes-bsp/multitech/mt-dt-overlay_1.0.4.bb @@ -0,0 +1,93 @@ +DESCRIPTION = "Compile MT board device tree overlays" +LICENSE = "(GPLv2+)" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit update-rc.d +INITSCRIPT_NAME = "${PN}" +INITSCRIPT_PARAMS = "start 40 S ." +DEPENDS = "dtc-native" +RDEPENDS_${PN} = "bash" + + +COMPATIBLE_MACHINE = "(mtcap|mtcdt|mtrv1)" + +# By using an overlay, we should be able to support multiple pinouts +# using the same image. The overlays go into /lib/dtoverlays. +# There names are: [hw-version]-driver.dtbo +# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo +# The idea is that mts-io will search for the overlays, and install the +# appropriate device tree overlay for the current hw-version. + +dt_dir = "/lib/dtoverlays" + +PR = "r1" + +SRC_URI = " \ + git://git.multitech.net/mt-dt-overlay.git;protocol=git \ + file://init \ +" + +SRCREV = "${PV}" + +DEPENDS = "virtual/kernel u-boot-mkimage-native" + +S = "${WORKDIR}/git" + +do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" +do_compile[nostamp] = "1" + +# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin +DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" + +do_compile () { + echo MACHINE is ${MACHINE} + oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos +} + +FILES_${PN} = "${dt_dir} ${sysconfdir}" + +addtask install after do_compile + +# The destination and any symlinks are defined in the source file. +# +# A line starting as follows " * Put: [destination]" in the source +# defines the destination file name for the device tree binaries. +# +# A line starting as follows " * Link: [destination]" defines a symlink +# to the device tree binary file. +# +do_install () { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/${PN} + # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) + if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then + install -d ${D}/${dt_dir} + ( + cd ${MACHINE} + echo "Current directory is $(pwd)" + for f in *.dtbo ; do + s=$(basename -s .dtbo $f).dtso + location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') + echo "Binary: $f Source: $s" + echo "Destination: $location_ln" + dirname=$(dirname $location_ln) + install -d ${D}/${dt_dir}/$dirname + install ${f} ${D}/${dt_dir}/$location_ln + links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') + echo "All Links: " + echo "$links" + echo "End links" + for l in $links ; do + ldirname=$(dirname $l) + if ! [ -d "${D}/$ldirname" ] ; then + install -d ${D}/${dt_dir}/$ldirname + fi + echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l + ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l + done + done + ) + fi +} + diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb b/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb deleted file mode 100644 index 5727e14..0000000 --- a/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb +++ /dev/null @@ -1,93 +0,0 @@ -DESCRIPTION = "Compile MT board device tree overlays" -LICENSE = "(GPLv2+)" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit update-rc.d -INITSCRIPT_NAME = "${PN}" -INITSCRIPT_PARAMS = "start 40 S ." -DEPENDS = "dtc-native" -RDEPENDS_${PN} = "bash" - - -COMPATIBLE_MACHINE = "(mtcap|mtcdt|mtrv1)" - -# By using an overlay, we should be able to support multiple pinouts -# using the same image. The overlays go into /lib/dtoverlays. -# There names are: [hw-version]-driver.dtbo -# e.g. /lib/dtoverlays/MTRV1-0.0-pps.dtbo -# The idea is that mts-io will search for the overlays, and install the -# appropriate device tree overlay for the current hw-version. - -dt_dir = "/lib/dtoverlays" - -PR = "r1" - -SRC_URI = " \ - git://git.multitech.net/mt-dt-overlay.git;protocol=git \ - file://init \ -" - -SRCREV = "${PV}" - -DEPENDS = "virtual/kernel u-boot-mkimage-native" - -S = "${WORKDIR}/git" - -do_compile[depends] += "virtual/kernel:do_deploy virtual/kernel:do_shared_workdir" -do_compile[nostamp] = "1" - -# Make sure we are using the Yocto version of DTC, not what is installed in /usr/bin -DTC_BIN_DIR = "${COMPONENTS_DIR}/x86_64/dtc-native/usr/bin" - -do_compile () { - echo MACHINE is ${MACHINE} - oe_runmake DTC=${DTC_BIN_DIR}/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos -} - -FILES_${PN} = "${dt_dir} ${sysconfdir}" - -addtask install after do_compile - -# The destination and any symlinks are defined in the source file. -# -# A line starting as follows " * Put: [destination]" in the source -# defines the destination file name for the device tree binaries. -# -# A line starting as follows " * Link: [destination]" defines a symlink -# to the device tree binary file. -# -do_install () { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/${PN} - # Copy files to /lib/dt-overlay/main (mtac cards will be in mtac) - if [ -e ${AT91BOOTSTRAP_MACHINE} ]; then - install -d ${D}/${dt_dir} - ( - cd ${MACHINE} - echo "Current directory is $(pwd)" - for f in *.dtbo ; do - s=$(basename -s .dtbo $f).dtso - location_ln=$(egrep '^[[:space:]]*\*[[:space:]]*Put:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Put:[[:space:]]*//') - echo "Binary: $f Source: $s" - echo "Destination: $location_ln" - dirname=$(dirname $location_ln) - install -d ${D}/${dt_dir}/$dirname - install ${f} ${D}/${dt_dir}/$location_ln - links=$(egrep '^[[:space:]]*\*[[:space:]]*Link:[[:space:]]*[^[:space:]]+' $s | sed -r 's/.*Link:[[:space:]]*//') - echo "All Links: " - echo "$links" - echo "End links" - for l in $links ; do - ldirname=$(dirname $l) - if ! [ -d "${D}/$ldirname" ] ; then - install -d ${D}/${dt_dir}/$ldirname - fi - echo ln -sf ${dt_dir}/$dirname/$f ${D}/${dt_dir}/$l - ln -sf ${dt_dir}/$location_ln ${D}/${dt_dir}/$l - done - done - ) - fi -} - diff --git a/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb b/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb index f004cec..ecc1fb2 100644 --- a/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb +++ b/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb @@ -49,12 +49,12 @@ do_compile () { PACKAGES = "kernel-module-${PN}" -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko" +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_gpiob.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_gpiob.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko + cp ${S}/mtac_gpiob.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra } diff --git a/recipes-bsp/multitech/mtac_4.0.7.bb b/recipes-bsp/multitech/mtac_4.0.7.bb new file mode 100644 index 0000000..ebe091a --- /dev/null +++ b/recipes-bsp/multitech/mtac_4.0.7.bb @@ -0,0 +1,69 @@ +DESCRIPTION = "mtac drivers" +HOMEPAGE = "http://www.multitech.net/" +SECTION = "base" +PRIORITY = "optional" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +do_fetch[depends]+="virtual/kernel:do_shared_workdir" +DEPENDS = "virtual/kernel mts-io" +INC_PR = "r0" +COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" + +SRCREV = "${PV}" + +# AUTOREV breaks mLinux source tarballs in Thud +# SRCREV = "${AUTOREV}" + +# Some packages depend on mtac +RPROVIDES_kernel-module-${PN} = "mtac" + +PR = "${INC_PR}.1" + +PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" + +SRC_URI = " \ + git://git.multitech.net/mtac.git;protocol=git;branch=master \ +" +S = "${WORKDIR}/git" + +inherit module + +MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers" + +COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ + KBUILD_VERBOSE=1 \ + KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \ + M=${S} \ + modules \ + " + +EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D ${MACHINE}'" +EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ + -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" + +do_compile () { + bbnote make "$@" + make "$@" + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake +} + +PACKAGES = "kernel-module-${PN} ${PN}-dev" + +FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.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.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra + + install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers + + install -d ${D}${includedir}/mts-kernel-headers/linux + install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux + cp ${S}/machine/* ${D}${includedir}/mts-kernel-headers/linux + chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux +} diff --git a/recipes-bsp/multitech/mtac_4.0.9.bb b/recipes-bsp/multitech/mtac_4.0.9.bb deleted file mode 100644 index ecabcb3..0000000 --- a/recipes-bsp/multitech/mtac_4.0.9.bb +++ /dev/null @@ -1,69 +0,0 @@ -DESCRIPTION = "mtac drivers" -HOMEPAGE = "http://www.multitech.net/" -SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -do_fetch[depends]+="virtual/kernel:do_shared_workdir" -DEPENDS = "virtual/kernel mts-io" -INC_PR = "r0" -COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)" - -SRCREV = "${AUTOREV}" - -# AUTOREV breaks mLinux source tarballs in Thud -# SRCREV = "${AUTOREV}" - -# Some packages depend on mtac -RPROVIDES_kernel-module-${PN} = "mtac" - -PR = "${INC_PR}.1" - -PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}" - -SRC_URI = " \ - git://git@gitlab.multitech.net/mirrors/mtac;protocol=ssh;branch=master \ -" -S = "${WORKDIR}/git" - -inherit module - -MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers" - -COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \ - KBUILD_VERBOSE=1 \ - KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \ - M=${S} \ - modules \ - " - -EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D ${MACHINE}'" -EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \ - -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'" - -do_compile () { - bbnote make "$@" - make "$@" - unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - oe_runmake -} - -PACKAGES = "kernel-module-${PN} ${PN}-dev" - -FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.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.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra - - install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers - - install -d ${D}${includedir}/mts-kernel-headers/linux - install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux - cp ${S}/machine/* ${D}${includedir}/mts-kernel-headers/linux - chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux -} diff --git a/recipes-bsp/multitech/mts-io/mts-io.init b/recipes-bsp/multitech/mts-io/mts-io.init index a75ceb9..ed0475e 100755 --- a/recipes-bsp/multitech/mts-io/mts-io.init +++ b/recipes-bsp/multitech/mts-io/mts-io.init @@ -210,13 +210,18 @@ read_card_info() { return 0 fi - - if [[ ${hw_name} == MTCAP ]] || [[ ${hw_name} == MTCDT ]]; then + if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then + modprobe spidev + ln -sf /dev/spidev32766.2 /dev/spidev0.0 + elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then + modprobe spidev + ln -sf /dev/spidev32765.2 /dev/spidev0.0 + elif [[ ${hw_name} == MTCAP ]]; then modprobe spidev elif [[ ${hw_name} == MTCDTIPHP ]]; then modprobe spidev ln -sf /dev/spidev32766.2 /dev/spidev0.0 - fi + fi } mfser_init() { -- cgit v1.2.3