Merge branch 'test-split'

Pull in changes to move to support Yocto Thud

22 files changed, 144 insertions, 853 deletions

diff --git a/recipes-bsp/multitech/get-eeprom-device-config/get-eeprom-device-config.sh b/recipes-bsp/multitech/get-eeprom-device-config/get-eeprom-device-config.sh
deleted file mode 100755
index ab47d31..0000000
--- a/recipes-bsp/multitech/get-eeprom-device-config/get-eeprom-device-config.sh
+++ /dev/null
@@ -1,281 +0,0 @@
-#!/bin/bash
-# Radio ID loop count
-TRY_COUNT=30
-
-CONFIG_PATH=/var/run/config
-
-#system capabilities
-CAPABILITY_ADC="false"
-CAPABILITY_BLUETOOTH="false"
-CAPABILITY_DIN="false"
-CAPABILITY_DOUT="false"
-#CAPABILITY_EXTERNAL_SERIAL_PORT="false"
-#CAPABILITY_FLEXIBLE_SERIAL_PORT="false"
-CAPABILITY_GPS="false"
-CAPABILITY_WIFI="false"
-CAPABILITY_CELL="false"
-CAPABILITY_LORA="false"
-CAPABILITY_GPIO="false"
-CAPABILITY_SERIAL="false"
-CAPABILITY_RS232="false"
-CAPABILITY_RS422="false"
-CAPABILITY_RS485="false"
-CAPABILITY_NODE_RED="false"
-CAPABILITY_LORA_NETWORK_SERVER="false"
-
-
-# accessory cards constans
-TEMP_AC_PATH="/var/volatile/tmp"
-TEMP_AC_JSON="$TEMP_AC_PATH/ac_data.json"
-# Number of accessory card places - size of array
-AC_CARD_COUNT=4
-
-function usage {
-	echo 'get-eeprom-device-info [-t TRY_COUNT]'
-        echo '  Where TRY_COUNT is the number of half'
-        echo '  second waits for the cellular radio'
-        echo '  to be ready for identification'
-        exit 1
-}
-
-# Reads accessory cards data
-# WARNING: Make sure function called after CAPABILITIY_* variables is set with initial values.
-ReadAcData() {
-  # Doing the same as mts-io-sysfs, but with one step, without unnesesary parsing.
-  MTS_IO_DIR="/sys/devices/platform/mts-io"
-  AC_PRFIX="ap"
-  TEMP_AC_FILE_PREFIX="/card"
-  TEMP_AC_PREFIX="$TEMP_AC_PATH$TEMP_AC_FILE_PREFIX"
-  # Fill property data for each accessory card
-  rm -f $TEMP_AC_PREFIX*
-  for f in `find $MTS_IO_DIR/$AC_PRFIX* -follow -maxdepth 1 -type f -follow -maxdepth 1 -type f 2>/dev/null`;
-  do
-    FILENAME=${f##*$MTS_IO_DIR/$AC_PRFIX}
-    case $FILENAME in
-      modalias )
-        ;;
-      power )
-        ;;
-      subsystem* )
-        ;;
-      uevent )
-        ;;
-      * )
-        AC_NUMBER=$(echo "$FILENAME" | cut -d "/" -f1)
-        AC_PROP=$(echo "$FILENAME" | cut -d "/" -f2)
-        # Do camel casing
-        # Because {sed -r '{s/-([a-z])/\U\1/g;}'} did not work for Not GNU sed 4.0 use awk + tr
-        # Removing next 2 lines gives about 50% function speed-up
-        AC_PROP=$( echo $AC_PROP | awk -F"-" '{for(j=1;j<=NF;j++){$j=toupper(substr($j,1,1))substr($j,2)}}1' | sed -r '{s/ //g;}' )
-        AC_PROP=`echo ${AC_PROP:0:1} | tr '[A-Z]' '[a-z]'`${AC_PROP:1}
-        #Output to temp file
-        AC_FILE="$TEMP_AC_PREFIX$AC_NUMBER"
-        printf "\"$AC_PROP\" : \"%s\",\n" `cat $f` >> $AC_FILE
-        ;;
-    esac
-  done
-  # Compose accessory cards data to array
-  echo "\"accessoryCards\" : [ " > $TEMP_AC_JSON
-  for ((I=1; I<=$AC_CARD_COUNT; ++I)) ;
-  do
-    AC_FILE="$TEMP_AC_PREFIX$I"
-    if [ -f "$AC_FILE" ];then
-      sed -i '$s/,$//' $AC_FILE # remove last comma
-      echo "{" >> $TEMP_AC_JSON
-      cat $AC_FILE >> $TEMP_AC_JSON
-      echo "}," >> $TEMP_AC_JSON
-
-      # Map product-id with capabilities.
-      if $(grep -q '"productId" : "MTAC-MFSER-DTE"' $AC_FILE) || $(grep -q '"productId" : "MTAC-MFSER-DCE"' $AC_FILE); then
-        CAPABILITY_SERIAL="true"
-        CAPABILITY_RS232="true"
-        CAPABILITY_RS422="true"
-        CAPABILITY_RS485="true"
-      elif $(grep -q '"productId" : "MTAC-GPIOB"' $AC_FILE) || $(grep -q '"productId" : "MTAC-GPIOI"' $AC_FILE); then
-        CAPABILITY_GPIO="true"
-        CAPABILITY_ADC="true"
-        CAPABILITY_DIN="true"
-        CAPABILITY_DOUT="true"
-      elif $(grep -q '"productId" : "MTAC-LORA-.*"' $AC_FILE); then
-        CAPABILITY_LORA="true"
-      fi
-    else
-      echo "null," >> $TEMP_AC_JSON
-    fi
-  done
-  sed -i '$s/,$//' $TEMP_AC_JSON # remove last comma
-  echo "]," >> $TEMP_AC_JSON
-}
-
-#check if LORA is present onboard a device.
-#Lora capability from an MTAC card is determined by ReadAcData()
-isNativeLoraPresent() {
-  LORA_ID_PREFIX="MTCAP-LORA-"
-  LORA_ID=$(mts-io-sysfs show lora/product-id 2> /dev/null)
-  if [[ $LORA_ID == $LORA_ID_PREFIX* ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-TEMP=$(getopt -o t: -n 'get-eeprom-device-info' -- "$@")
-eval set -- "$TEMP"
-# extract options and their arguments into variables.
-while true ; do
-    case "$1" in
-        -t)
-            case "$2" in
-                "") usage ;;
-                *) TRY_COUNT=$2 ; shift 2 ;;
-            esac ;;
-        --) shift ; break ;;
-        *) echo "usage" ;;
-    esac
-done
-
-# Read device information from eeprom device
-
-mts-id-eeprom --in-file /sys/bus/i2c/devices/i2c-0/0-0056/eeprom > ${CONFIG_PATH}/device_info
-
-DEVICE_CAPA=${CONFIG_PATH}/device_capa
-DEVICE_INFO_JSON=${CONFIG_PATH}/device_info.json
-
-# Create json data files
-echo "{" > $DEVICE_CAPA
-echo "{" > ${CONFIG_PATH}/device_info.json
-
-
-# Read each line and parse the device data
-while read line
-do
-
-if [[ $line =~ ^vendor-id:\ \"(.*)\" ]]; then
-    echo ${BASH_REMATCH[1]} > ${CONFIG_PATH}/vendor_id
-    echo \"vendorId\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ ^product-id:\ \"(.*)\" ]]; then
-    echo ${BASH_REMATCH[1]} > ${CONFIG_PATH}/device_type
-    echo \"productId\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ ^device-id:\ \"(.*)\" ]]; then
-    echo ${BASH_REMATCH[1]} > ${CONFIG_PATH}/device_id
-    echo \"deviceId\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ ^hw-version:\ \"(.*)\" ]]; then
-    echo ${BASH_REMATCH[1]} > ${CONFIG_PATH}/hw_version
-    echo \"hardwareVersion\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ ^mac-addr:\ \"(.*)\" ]]; then
-    echo ${BASH_REMATCH[1]} > ${CONFIG_PATH}/mac_addr
-    echo \"macAddress\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ ^mac-bluetooth:\ \"(.*)\" ]]; then
-    echo ${BASH_REMATCH[1]} > ${CONFIG_PATH}/mac_bluetooth
-    echo \"macBluetooth\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ ^mac-wifi:\ \"(.*)\" ]]; then
-    echo ${BASH_REMATCH[1]} > ${CONFIG_PATH}/mac_wifi
-    echo \"macWifi\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ ^uuid:\ \"(.*)\" ]]; then
-    echo ${BASH_REMATCH[1]} > ${CONFIG_PATH}/uuid
-    echo \"uuid\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ ^imei:\ \"(.*)\" ]]; then
-    echo ${BASH_REMATCH[1]} > ${CONFIG_PATH}/modem_imei
-    echo \"imei\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ capa-gps:\ (.*) ]]; then
-    CAPABILITY_GPS=$(echo ${BASH_REMATCH[1]})
-elif [[ $line =~ capa-din:\ (.*) ]]; then
-    CAPABILITY_DIN=$(echo ${BASH_REMATCH[1]})
-elif [[ $line =~ capa-dout:\ (.*) ]]; then
-    CAPABILITY_DOUT=$(echo ${BASH_REMATCH[1]})
-elif [[ $line =~ capa-adc:\ (.*) ]]; then
-    CAPABILITY_ADC=$(echo ${BASH_REMATCH[1]})
-elif [[ $line =~ capa-wifi:\ (.*) ]]; then
-    CAPABILITY_WIFI=$(echo ${BASH_REMATCH[1]})
-elif [[ $line =~ capa-bluetooth:\ (.*) ]]; then
-    CAPABILITY_BLUETOOTH=$(echo ${BASH_REMATCH[1]})
-elif [[ $line =~ capa:\ \"(.*)\" ]]; then
-    echo \"mask\": \"${BASH_REMATCH[1]}\", >> $DEVICE_CAPA
-fi
-
-done <${CONFIG_PATH}/device_info
-
-HASRADIO=$(cat /sys/devices/platform/mts-io/has-radio)                               
-if ((HASRADIO == 1)) ; then
-  echo "Finding cellular module..."
-  for ((i=0; i < TRY_COUNT; i++))
-    do
-      # Check cellular module
-      echo "Try #"$i
-      if [[ -L "/dev/modem_at0" && -L "/dev/modem_at1" ]]; then
-        CAPABILITY_CELL="true"
-        break
-      fi
-      if ((TRY_COUNT > 1)) ; then
-        sleep 0.5
-      fi
-    done
-fi
-
-if isNativeLoraPresent; then
-  CAPABILITY_LORA="true"
-fi
-
-#
-# Check if NODE-RED and Lora Network Server packages are installed
-#
-OPKG_FILE=/tmp/opkg_inst.tmp
-opkg list-installed > $OPKG_FILE
-
-cat $OPKG_FILE | grep node-red > /dev/null
-[ $? -eq 0 ] && CAPABILITY_NODE_RED="true"
-
-cat $OPKG_FILE | grep lora-network-server > /dev/null
-[ $? -eq 0 ] && CAPABILITY_LORA_NETWORK_SERVER="true"
-
-rm -f $OPKG_FILE
-
-
-# Read firmware info from /etc/issue
-cat /etc/issue |
-(
-while read line
-do
-
-if [[ $line =~ Version:\ (.*) ]]; then
-    echo \"firmware\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-elif [[ $line =~ Date:\ (.*) ]]; then
-    echo \"firmwareDate\": \"${BASH_REMATCH[1]}\", >> $DEVICE_INFO_JSON
-fi
-
-done
-)
-# Add accessory cards
-echo "Reading accessory cards data"
-ReadAcData
-echo "Adding accessory cards data"
-cat $TEMP_AC_JSON >> $DEVICE_INFO_JSON
-
-# Complete the json files
-echo \"adc\": $CAPABILITY_ADC, >> $DEVICE_CAPA
-echo \"bluetooth\": $CAPABILITY_BLUETOOTH, >> $DEVICE_CAPA
-echo \"din\": $CAPABILITY_DIN, >> $DEVICE_CAPA
-echo \"dout\": $CAPABILITY_DOUT, >> $DEVICE_CAPA
-echo \"gps\": $CAPABILITY_GPS, >> $DEVICE_CAPA
-echo \"wifi\": $CAPABILITY_WIFI, >> $DEVICE_CAPA
-echo \"cell\": $CAPABILITY_CELL, >> $DEVICE_CAPA
-echo \"lora\": $CAPABILITY_LORA, >> $DEVICE_CAPA
-echo \"gpio\": $CAPABILITY_GPIO, >> $DEVICE_CAPA
-echo \"serial\": $CAPABILITY_SERIAL, >> $DEVICE_CAPA
-echo \"rs232\": $CAPABILITY_RS232, >> $DEVICE_CAPA
-echo \"rs422\": $CAPABILITY_RS422, >> $DEVICE_CAPA
-echo \"rs485\": $CAPABILITY_RS485, >> $DEVICE_CAPA
-echo \"nodeRed\": $CAPABILITY_NODE_RED, >> $DEVICE_CAPA
-echo \"loraNetworkServer\": $CAPABILITY_LORA_NETWORK_SERVER >> $DEVICE_CAPA
-echo "}" >> $DEVICE_CAPA
-echo \"capabilities\": >> $DEVICE_INFO_JSON
-cat $DEVICE_CAPA >> $DEVICE_INFO_JSON
-echo "}" >> $DEVICE_INFO_JSON
-
-# Clean up temp files
-rm $DEVICE_CAPA
-rm ${CONFIG_PATH}/device_info
-
-#echo device_info.json ----------
-#cat /var/run/config/device_info.json
-#echo ---------------------------
diff --git a/recipes-bsp/multitech/get-eeprom-device-config_1.2.1.bb b/recipes-bsp/multitech/get-eeprom-device-config_1.2.1.bb
deleted file mode 100644
index c2330c3..0000000
--- a/recipes-bsp/multitech/get-eeprom-device-config_1.2.1.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-# Script to copy the EEPROM to /run/config and
-# init script to populate /run/config
-inherit update-rc.d
-PR = "r1"
-DESCRIPTION = "EEPROM copyting tool"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
-RDEPENDS_${PN} =+ "bash"
-
-SRCREV = "${PV}"
-
-SRC_URI = "file://${PN}.sh \
-           file://init"
-
-PARALLEL_MAKE = ""
-
-
-fakeroot do_install_append() {
-    # install MTCAP mts-io init script
-    install -d 0755 ${D}${base_sbindir}
-    install -d 0755 ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/${PN}.sh  ${D}${base_sbindir}/${PN}
-    install -m 0755 ${WORKDIR}/init  ${D}${sysconfdir}/init.d/eeprom-config
-}
-
-
-INITSCRIPT_NAME = "eeprom-config"
-# Must start after MTS-IO to read the accessory cards.
-INITSCRIPT_PARAMS = "start 40 S ."
diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.0.0.bb b/recipes-bsp/multitech/mt-dt-overlay_1.0.0.bb
deleted file mode 100644
index 2714705..0000000
--- a/recipes-bsp/multitech/mt-dt-overlay_1.0.0.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "Compile MT board device tree overlays"
-LICENSE = "(GPLv2+)"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-# 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"
-
-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"
-
-do_compile () {
-        echo MACHINE is ${MACHINE}
-	oe_runmake DTC=/usr/bin/dtc KERNEL_DIR=${STAGING_KERNEL_DIR} KERNEL_BUILD_DIR=${KERNEL_PATH} ${MACHINE}_dtbos
-}
-
-FILES_${PN} = "${dt_dir}"
-
-addtask install after do_compile
-
-do_install () {
-    # 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}
-            for f in *.dtbo ; do
-                if [[ -h $f ]] ; then
-                    cp -df ${f} ${D}/${dt_dir}
-                else
-                    install ${f} ${D}/${dt_dir}
-                fi
-            done
-        )
-    fi;
-}
-
diff --git a/recipes-bsp/multitech/mtac-eth_1.1.0.bb b/recipes-bsp/multitech/mtac-eth_1.1.0.bb
deleted file mode 100644
index af4d9fb..0000000
--- a/recipes-bsp/multitech/mtac-eth_1.1.0.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "MTAC ETH (Ethernet) Card"
-HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-eth/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "virtual/kernel mtac mts-io"
-RDEPENDS_${PN} = "kernel-module-mtac"
-INC_PR = "r0"
-
-SRCREV = "${PV}"
-
-PR = "${INC_PR}.0-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
-SRC_URI = " \
-    git://git.multitech.net/mtac-eth.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_eth.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_eth.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-}
diff --git a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb b/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
deleted file mode 100644
index 9c1b673..0000000
--- a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "MTAC GPIOB Card"
-HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-gpiob/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "virtual/kernel mtac mts-io"
-RDEPENDS_${PN} = "kernel-module-mtac"
-INC_PR = "r0"
-
-SRCREV = "${AUTOREV}"
-
-PR = "${INC_PR}.0-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
-SRC_URI = " \
-    git://git.multitech.net/mtac-gpiob.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_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
-}
diff --git a/recipes-bsp/multitech/mtac-lora_1.1.4.bb b/recipes-bsp/multitech/mtac-lora_1.1.4.bb
deleted file mode 100644
index 603db92..0000000
--- a/recipes-bsp/multitech/mtac-lora_1.1.4.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "MTAC LoRa Card"
-HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-lora/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "virtual/kernel mtac mts-io"
-RDEPENDS_${PN} = "kernel-module-mtac"
-INC_PR = "r0"
-
-SRCREV = "${PV}"
-
-PR = "${INC_PR}.0-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
-SRC_URI = " \
-    git://git.multitech.net/mtac-lora.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_lora.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_lora.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-}
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 1637b86..0000000
--- a/recipes-bsp/multitech/mtac-mfser_1.1.0.bb
+++ /dev/null
@@ -1,46 +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"
-DEPENDS = "virtual/kernel mtac mts-io"
-RDEPENDS_${PN} = "kernel-module-mtac"
-INC_PR = "r0"
-
-SRCREV = "${PV}"
-
-PR = "${INC_PR}.0-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
-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-pulse_1.1.0.bb b/recipes-bsp/multitech/mtac-pulse_1.1.0.bb
deleted file mode 100644
index dfe2ce0..0000000
--- a/recipes-bsp/multitech/mtac-pulse_1.1.0.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "MTAC PULSE Card"
-HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-pulse/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "virtual/kernel mtac mts-io"
-RDEPENDS_${PN} = "kernel-module-mtac"
-INC_PR = "r0"
-
-SRCREV = "${PV}"
-
-PR = "${INC_PR}.0-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
-SRC_URI = " \
-    git://git.multitech.net/mtac-pulse.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_pulse.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_pulse.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-}
diff --git a/recipes-bsp/multitech/mtac-xdot/xdot-util b/recipes-bsp/multitech/mtac-xdot/xdot-util
deleted file mode 100755
index f805305..0000000
--- a/recipes-bsp/multitech/mtac-xdot/xdot-util
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-function detect_hw {
-    if [ ! -d /sys/devices/platform/mts-io/xdot ]; then
-       echo "XDOT hardware not found"
-       exit
-    fi
-}
-
-function detect_hw_dev {
-    if [ ! -h /dev/disk/by-label/XDOT ]; then
-       echo "XDOT dev hardware not found"
-       exit
-    fi
-}
-
-function flash {
-    echo "Flashing new firmware"
-    cp $FIRMWARE_FILE $TEMP_DIR
-}
-
-function mount_xdot {
-    TEMP_DIR=`mktemp -d`
-    mount /dev/disk/by-label/XDOT $TEMP_DIR
-}
-
-function reset {
-    mts-io-sysfs store xdot/reset 0
-    mts-io-sysfs store xdot/reset 1
-    mts-io-sysfs store xdot/reset -- -1 &>/dev/null
-}
-
-function usb_reset {
-    echo 0 > /sys/bus/usb/devices/1-2.1/authorized
-    sleep 1
-    echo 1 > /sys/bus/usb/devices/1-2.1/authorized
-}
-
-function clean_up {
-	umount $TEMP_DIR
-	rm -fr $TEMP_DIR
-}
-
-case "$1" in
-"flash")
-    detect_hw_dev
-    FIRMWARE_FILE=$2
-    mts-io-sysfs store xdot/reset -- -1 &>/dev/null
-    mount_xdot
-    flash
-    clean_up
-    sleep 1
-    reset
-    echo done
-    ;;
-"mount")
-    detect_hw_dev
-    mount_xdot
-    echo Mounted at $TEMP_DIR
-    ;;
-"reset")
-    detect_hw
-    reset
-    ;;
-"usb-reset")
-    detect_hw
-    usb_reset
-    ;;
-*) ## If no parameters are given, print which are avaiable. 
-    echo "Usage: $0 {flash|mount|reset|usb-reset}"
-    ;;                                                                                  
-esac
diff --git a/recipes-bsp/multitech/mtac-xdot_1.1.0.bb b/recipes-bsp/multitech/mtac-xdot_1.1.0.bb
deleted file mode 100644
index 1fb5c87..0000000
--- a/recipes-bsp/multitech/mtac-xdot_1.1.0.bb
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "MTAC XDOT (LoRa) Card"
-HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-xdot/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "virtual/kernel mtac mts-io"
-RDEPENDS_${PN} = "kernel-module-mtac"
-INC_PR = "r2"
-
-SRCREV = "${PV}"
-
-PR = "${INC_PR}.0-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
-SRC_URI = " \
-    git://git.multitech.net/mtac-xdot.git;protocol=git \
-    file://xdot-util \
-"
-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} ${PN}-util"
-
-FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_xdot.ko"
-
-FILES_${PN}-util += "${sbindir}/xdot-util"
-
-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_xdot.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-
-    install -m 0755 -d ${D}${sbindir}
-    install -m 0755 ${WORKDIR}/xdot-util ${D}${sbindir}/xdot-util
-}
diff --git a/recipes-bsp/multitech/mtac_4.0.3.bb b/recipes-bsp/multitech/mtac_4.0.3.bb
deleted file mode 100644
index dea70f1..0000000
--- a/recipes-bsp/multitech/mtac_4.0.3.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "mtac drivers"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "virtual/kernel mts-io"
-INC_PR = "r0"
-
-# SRCREV = "${PV}"
-SRCREV = "${AUTOREV}"
-
-PR = "${INC_PR}.0-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
-SRC_URI = " \
-    git://git.multitech.net/mtac.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} ${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 -d ${D}${includedir}/mts-kernel-headers/linux
-    install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux
-}
diff --git a/recipes-bsp/multitech/mts-id-eeprom.inc b/recipes-bsp/multitech/mts-id-eeprom.inc
index f149f40..6b7b262 100644
--- a/recipes-bsp/multitech/mts-id-eeprom.inc
+++ b/recipes-bsp/multitech/mts-id-eeprom.inc
@@ -8,9 +8,19 @@ INC_PR = "r2"
 DEPENDS = "mts-io openssl"
 RDEPENDS_${PN} =+ "bash"
 
+# mts-id-eeprom has been machine dependent since 3.3.12
+# This is a new Yocto requirement.
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS_append_mtcdt3 = " mtcdt3b"
+DEPENDS_append_mtcdt3hs = " mtcdt3b"
+
+TARGET_CFLAGS_append_mtcdt3 = " -D MTCDT3B"
+TARGET_CFLAGS_append_mtcdt3hs = " -D MTCDT3B"
+
 SRCREV = "${PV}"
 
-SRC_URI = "git://git.multitech.net/mts-id-eeprom.git;protocol=git"
+SRC_URI = "git://git@gitlab.multitech.net/mirrors/mts-id-eeprom.git;protocol=ssh"
 SRC_URI_append_mtcdt = " file://mtcdt-fpga-v31.hex  file://mtcdt-fpga-v33.hex"
 SRC_URI_append_mtcap = " file://mtcap-fpga-v31.hex  file://mtcap-fpga-v33.hex"
 
@@ -41,3 +51,13 @@ fakeroot do_install_append_mtcdt() {
     install -m 0444 ${WORKDIR}/${MACHINE}-fpga-v33.hex  ${D}${libdir}/mts-flash-binaries
 }
 
+
+fakeroot do_install_append_mtcdt3() {
+    # adjust u-boot partition name (nand -> mmc)
+    sed -i 's/^.*fgrep.*$/if false; then/g' ${D}/${base_sbindir}/mts-ubpasswd
+}
+
+fakeroot do_install_append_mtcdt3hs() {
+    # adjust u-boot partition name (nand -> mmc)
+    sed -i 's/^.*fgrep.*$/if false; then/g' ${D}/${base_sbindir}/mts-ubpasswd
+}
diff --git a/recipes-bsp/multitech/mts-id-eeprom_0.5.2.bb b/recipes-bsp/multitech/mts-id-eeprom_0.4.7.bb
index ccf3521..ccf3521 100644
--- a/recipes-bsp/multitech/mts-id-eeprom_0.5.2.bb
+++ b/recipes-bsp/multitech/mts-id-eeprom_0.4.7.bb
diff --git a/recipes-bsp/multitech/get-eeprom-device-config/init b/recipes-bsp/multitech/mts-io-sysfs/mts-io-sysfs.init
index 0ba5075..3af4f71 100755
--- a/recipes-bsp/multitech/get-eeprom-device-config/init
+++ b/recipes-bsp/multitech/mts-io-sysfs/mts-io-sysfs.init
@@ -8,32 +8,32 @@
 # Short-Description: Create /run/config with eeprom configuration
 ### END INIT INFO
 
-GETCONFIG=/sbin/get-eeprom-device-config
-JASONFILE=/run/config/device_info.json
+GETCONFIG=/usr/sbin/mts-io-sysfs
+JSONFILE=/run/config/device_info.json
 
 case "$1" in
   start)
-        if ! [[ -f /run/config/device_info.json ]] ; then
-		[[ -d /run/config ]] || mkdir -m 755 -p /run/config
-		if [[ -x ${GETCONFIG} ]] ; then
-                       	${GETCONFIG} -t1  # Radio might not be found yet.
-		fi
-	fi
+    if ! [[ -f ${JSONFILE} ]] ; then
+  		[[ -d /run/config ]] || mkdir -m 755 -p /run/config
+  		if [[ -x ${GETCONFIG} ]] ; then
+        ${GETCONFIG} init -t1  # Radio might not be found yet.
+  		fi
+    fi
 	;;
   stop)
 	;;
   force-reload)
   	rm -rf /run/config/*
-        ${GETCONFIG}
+        ${GETCONFIG} init
 	;;
   restart)
-        ${GETCONFIG}
+        ${GETCONFIG} init
 	;;
   reload)
-        ${GETCONFIG}
+        ${GETCONFIG} init
 	;;
   status)         
-        if [[ -f ${JASONFILE} ]] ; then
+        if [[ -f ${JSONFILE} ]] ; then
                 echo EEPROM Config is populated
                 exit 0                  
         else                       
diff --git a/recipes-bsp/multitech/mts-io-sysfs_0.1.8.bb b/recipes-bsp/multitech/mts-io-sysfs_0.1.8.bb
new file mode 100644
index 0000000..8f32c29
--- /dev/null
+++ b/recipes-bsp/multitech/mts-io-sysfs_0.1.8.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "mts-io sysfs wrapper"
+HOMEPAGE = "http://www.multitech.net/"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+inherit update-rc.d
+
+DEPENDS = "libmts"
+RDEPENDS_${PN} = "bash"
+PR = "r0"
+
+SRCREV = "${PV}"
+
+SRC_URI = "git://git@gitlab.multitech.net/mirrors/mts-io-sysfs;protocol=ssh;branch=master \
+           file://mts-io-sysfs.init"
+
+S = "${WORKDIR}/git"
+
+do_configure_append() {
+}
+
+do_compile() {
+    oe_runmake
+}
+
+
+fakeroot do_install() {
+    install -d ${D}${sbindir}
+    install -m 0755 ${S}/build/mts-io-sysfs ${D}${sbindir}/mts-io-sysfs
+    install -d 0755 ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/mts-io-sysfs.init  ${D}${sysconfdir}/init.d/eeprom-config
+}
+
+
+INITSCRIPT_NAME = "eeprom-config"
+# Must start after MTS-IO to read the accessory cards.
+INITSCRIPT_PARAMS = "start 40 S ."
+
+
+PACKAGES = "${PN}"
+
+FILES_${PN} += "${libdir}/mts-io-sysfs*"
+FILES_${PN} += "${sbindir}/mts-io-sysfs"
+
+# disable this on purpose for dev purposes
+do_rm_work() {
+    echo "skipping"
+}
diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc
index 3360570..70b39c9 100644
--- a/recipes-bsp/multitech/mts-io.inc
+++ b/recipes-bsp/multitech/mts-io.inc
@@ -6,11 +6,14 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://io-module/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://io-tool/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 "
-DEPENDS = "virtual/kernel"
-INC_PR = "r1"
+do_fetch[depends] += "virtual/kernel:do_shared_workdir"
+INC_PR = "r3"
 
-SRCREV = "${PV}"
+# SRCREV = "${PV}"
+SRCREV = "${AUTOREV}"
 
+# Some package needs to provide mts-io
+RPROVIDES_kernel-module-${PN} = "mts-io"
 
 SRC_URI = " \
     git://git.multitech.net/mts-io.git;protocol=git \
@@ -27,11 +30,6 @@ inherit module
 inherit update-rc.d
 inherit autotools
 
-# add this since we aren't using module.bbclass
-addtask make_scripts after do_patch before do_compile
-do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
-do_make_scripts[deptask] = "do_populate_sysroot"
-
 EXTRA_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
                 KBUILD_VERBOSE=1 \
                 M=${S}/io-module \
@@ -48,6 +46,8 @@ do_compile () {
 
 PACKAGES = "${PN}-noarch kernel-module-${PN} ${PN}-util ${PN}-util-dbg ${PN}-dev"
 
+RDEPENDS_${PN}-dev = ""
+
 FILES_kernel-module-${PN} = " \
     ${base_libdir}/modules/${KERNEL_VERSION}/extra/mts_io.ko \
     ${sysconfdir}/modprobe.d/mts-io.conf \
@@ -59,8 +59,6 @@ FILES_${PN}-noarch = "${sysconfdir}/init.d/mts-io \
                         ${sysconfdir}/init.d/led-status_heartbeat_trigger"
                         
                         
-FILES_${PN}-noarch += "${libdir}/mts-io-sysfs*"
-FILES_${PN}-noarch += "${sbindir}/mts-io-sysfs"
 FILES_${PN}-noarch_append_mtcap += "${sbindir}/lora-led-updater"
 FILES_${PN}-util += "${sbindir}/mts-util-lora2-reset"
 FILES_${PN}-util-dbg += "/usr/src /usr/sbin/.debug"
@@ -100,14 +98,12 @@ fakeroot do_install () {
     install -d ${D}${sysconfdir}/modprobe.d
     install -m 0644 ${WORKDIR}/mts-io.blacklist ${D}${sysconfdir}/modprobe.d/mts-io.conf
 
+
     # blink status LED after booted
     install -d ${D}${sysconfdir}/rc5.d
     ln -sf ${sysconfdir}/init.d/led-status_heartbeat_trigger ${D}/${sysconfdir}/rc5.d/S95led-status_heartbeat_trigger
 
     install -m 0755 -d ${D}${sbindir}
-    install -d ${D}${libdir}/mts-io-sysfs
-    install -m 0755 ${S}/io-tool/mts-io-sysfs-inc.sh ${D}${libdir}/mts-io-sysfs
-    install -m 0755 ${S}/io-tool/mts-io-sysfs ${D}${sbindir}/mts-io-sysfs
 }
 
 fakeroot do_install_append_mtcap() {
diff --git a/recipes-bsp/multitech/mts-io/mts-io.init b/recipes-bsp/multitech/mts-io/mts-io.init
index 966d5ae..fee8f61 100755
--- a/recipes-bsp/multitech/mts-io/mts-io.init
+++ b/recipes-bsp/multitech/mts-io/mts-io.init
@@ -14,6 +14,9 @@
 i2c=/sys/bus/i2c/devices/
 GPSCONFIGTYPE="/var/run/config/gpstype"
 DEVTREE="/sys/kernel/config/device-tree/overlays/"
+HWPATH="/sys/devices/platform/mts-io/hw-version"
+MTSIOMODPATH="/lib/modules/$(uname -r)/extra/"
+MTCDTBB="${MTSIOMODPATH}/mtcdt3b.ko"
 
 ((fail=0))
 # To log debug, set LOGDBG to /usr/bin/LOGGER
@@ -28,9 +31,11 @@ hw=""
 hw_name=""
 MTAC_MODULES=""
 ((HASAP=0))
+((HASBB=0))
 
 sethwtype() {
     # mts-io must be loaded before trying this
+    # Also, mtcdt3b should be loaded if it exists
     hw=$(${SYSFS} show hw-version)
     hw_name=(${hw//-/ })
    
@@ -43,10 +48,15 @@ sethwtype() {
     MTCDT|MTCDTIP)
         ((HASAP = 1))
         ;;
+    MTCDT3)
+        ((HASBB = 1))
+        ;;
     *)
         ;;
     esac
-    MTAC_MODULES=$(cd /lib/modules/$(uname -r)/extra/;ls mtac_* 2>/dev/null)
+    MTAC_MODULES=$(cd ${MTSIOMODPATH};ls mtac_* 2>/dev/null)
+    MTBB_MODULES=$(cd ${MTSIOMODPATH};ls mtcdt3b_* 2>/dev/null)
+    
 }
 
 setdevtree() {
@@ -93,14 +103,18 @@ RST[5]="${sysdir}/ap2/creset"
 RST[6]="${sysdir}/secure-reset"
 RST[7]="${sysdir}/eth-reset"
 RST[8]="${sysdir}/sm1-reset"
-
-# GPSGNSSRESET is now set low during boot and is special cased.
-#if ((GPSGNSSRESET)) ; then
-#	RST[9]="${sysdir}/gnss-reset"
-#fi
+RST[9]="${sysdir}/slot1/reset"
+RST[10]="${sysdir}/slot1/creset"
+RST[11]="${sysdir}/slot2/reset"
+RST[12]="${sysdir}/slot2/creset"
+if ((GPSGNSSRESET)) ; then
+	RST[13]="${sysdir}/gnss-reset"
+fi
 
 WPIN[0]="${sysdir}/ap1/cdone"
 WPIN[1]="${sysdir}/ap2/cdone"
+WPIN[2]="${sysdir}/slot1/cdone"
+WPIN[3]="${sysdir}/slot2/cdone"
 
 USLPTIME=60000 # 30 milliseconds from Redpine Signals Reset Spec
 WAIT="/bin/busybox usleep ${USLPTIME}"
@@ -257,11 +271,18 @@ set_gpslink() {
         return
     fi
     
-    if [[ ${hw_name} == MTR ]] || [[ ${hw_name} == MTRV1 ]] || [[ ${hw_name} == MTHS ]] ; then
-        ln -sf /dev/ttyS1 /dev/gps0
-        echo "venus" >"$GPSCONFIGTYPE"
-        return
-    fi
+    case ${hw_name} in
+	MTR|MTRV1|MTHS)
+	    ln -sf /dev/ttyS1 /dev/gps0
+	    echo "venus" >"$GPSCONFIGTYPE"
+	    return
+	    ;;
+	MTCDT3)
+	    ln -sf /dev/ttyS1 /dev/gps0
+	    echo "u-blox" >"$GPSCONFIGTYPE"
+	    return
+	    ;;
+    esac
     
     if [[ ${hw} == MTCDT ]] && [[ ${HWLVL} ==  0.0 ]] ; then
         # No GPS
@@ -286,7 +307,13 @@ case $1 in
     if ! modprobe mts_io ; then
     	((fail++))
     fi
-
+    # MTCDTBB driver is needed to determine the product type on MTCDT3
+    if [[ -f ${MTCDTBB} ]] ; then
+	if ! modprobe mtcdt3b ; then
+	    ((fail++))
+	fi
+    fi
+	
     sethwtype
     setdevtree
     
@@ -298,22 +325,20 @@ case $1 in
             modprobe ${f//.ko} 2>&1 | grep -v 'No such device or address'
         done
     fi
+
+    if ((${#MTBB_MODULES})) ; then
+        # install mcdt3b explicitly or any unused modules will cause
+        # junk to the log as mtcdt3b is loaded and unloaded each time.
+        modprobe mtcdt3b
+        for f in ${MTBB_MODULES} ; do
+            modprobe ${f//.ko} 2>&1 | grep -v 'No such device or address'
+        done
+    fi
     set_gpslink # Set GPS symlink.
     /usr/bin/logger -t "mts-io" -p daemon.info -s "Resetting system modules"
     read_card_info
-    has_gnss_reset=0
-    # On boot, gnss-reset will be low
-    if [[ -f ${sysdir}/gnss-reset ]] ; then
-	if (($(mts-io-sysfs show gnss-reset) == 1)) ; then
-		mts-io-sysfs store gnss-reset 0
-	fi
-        has_gnss_reset=1
-    fi
     /bin/busybox usleep $USLPTIME
     reset_array
-    if ((has_gnss_reset)) ; then
-        mts-io-sysfs store gnss-reset 1
-    fi
     # use radio-reset init script for radio-reset
     mfser_init
 
@@ -347,6 +372,7 @@ case $1 in
   stop)
     /usr/bin/logger -t "mts-io" -p daemon.info -s "Unloading mtac modules and mts-io module"
     MTAC_MODULES=$(lsmod | grep '^mtac_' | sed  -e 's/_/-/' -e 's/ .*//')
+    MTCDT3B_MODULES=$(lsmod | grep '^mtcdt3b_' | sed  -e 's/_/-/' -e 's/ .*//')
 
     for f in ${MTAC_MODULES} ; do
         if ! modprobe -r "$f" ; then
diff --git a/recipes-bsp/multitech/mts-io_4.1.4.bb b/recipes-bsp/multitech/mts-io_4.1.4.bb
deleted file mode 100644
index 92937cd..0000000
--- a/recipes-bsp/multitech/mts-io_4.1.4.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require mts-io.inc
-
-PR = "${INC_PR}.0-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
diff --git a/recipes-bsp/multitech/mts-io_4.3.0.bb b/recipes-bsp/multitech/mts-io_4.3.0.bb
new file mode 100644
index 0000000..9311675
--- /dev/null
+++ b/recipes-bsp/multitech/mts-io_4.3.0.bb
@@ -0,0 +1,4 @@
+require mts-io.inc
+
+PR = "r0${KERNEL_MODULE_PACKAGE_SUFFIX}"
+
diff --git a/recipes-bsp/multitech/mts-io_4.3.2.bb b/recipes-bsp/multitech/mts-io_4.3.2.bb
deleted file mode 100644
index 92937cd..0000000
--- a/recipes-bsp/multitech/mts-io_4.3.2.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require mts-io.inc
-
-PR = "${INC_PR}.0-${MLINUX_KERNEL_VERSION}${MLINUX_KERNEL_EXTRA_VERSION}"
-
diff --git a/recipes-bsp/multitech/u-boot-linux-utils/DEFAULT_ENV.cfg b/recipes-bsp/multitech/u-boot-linux-utils/DEFAULT_ENV.cfg
deleted file mode 100644
index 261fc86..0000000
--- a/recipes-bsp/multitech/u-boot-linux-utils/DEFAULT_ENV.cfg
+++ /dev/null
@@ -1 +0,0 @@
-"ethact=macb0\0" "stderr=serial\0" "stdin=serial\0" "stdout=serial\0"
diff --git a/recipes-bsp/multitech/u-boot-linux-utils_0.2.1.bb b/recipes-bsp/multitech/u-boot-linux-utils_0.2.1.bb
deleted file mode 100644
index 65ea852..0000000
--- a/recipes-bsp/multitech/u-boot-linux-utils_0.2.1.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "U-Boot Linux Utilities"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-# Defaults are different depending on machine type.
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-PR = "r1"
-
-DEPENDS = "mtd-utils u-boot"
-
-# tag 0.2.1
-SRCREV = "fce83ee60201d82ec22f14baac9fd7382a0ad4ac"
-
-SRC_URI = "git://git.multitech.net/u-boot-linux-utils.git;protocol=git \
-	   file://DEFAULT_ENV.cfg"
-
-S = "${WORKDIR}/git"
-CFLAGS += "-idirafter ${STAGING_DIR_TARGET}/usr/include/u-boot"
-inherit autotools
-
-PARALLEL_MAKE = ""