From 5058ffaad9f2094dff5828e3aa65d54d2988f3c2 Mon Sep 17 00:00:00 2001
From: Jason Reiss <jreiss@multitech.com>
Date: Tue, 9 Jun 2020 08:33:00 -0500
Subject: update mts-id-eeprom to 0.5.2 on ext git, add v35 FPGA for
 MTAC-LORA-H

---
 recipes-bsp/multitech/mts-id-eeprom.inc      | 11 +++++++----
 recipes-bsp/multitech/mts-id-eeprom_0.4.7.bb |  3 ---
 recipes-bsp/multitech/mts-id-eeprom_0.5.2.bb |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 recipes-bsp/multitech/mts-id-eeprom_0.4.7.bb
 create mode 100644 recipes-bsp/multitech/mts-id-eeprom_0.5.2.bb

diff --git a/recipes-bsp/multitech/mts-id-eeprom.inc b/recipes-bsp/multitech/mts-id-eeprom.inc
index 6db36c4..c38e2bc 100644
--- a/recipes-bsp/multitech/mts-id-eeprom.inc
+++ b/recipes-bsp/multitech/mts-id-eeprom.inc
@@ -20,8 +20,13 @@ TARGET_CFLAGS_append_mtcdt3hs = " -D MTCDT3B"
 
 SRCREV = "${PV}"
 
+<<<<<<< HEAD
 SRC_URI = "git://git.multitech.net/mts-id-eeprom.git;protocol=git \
 SRC_URI_append_mtcdt = " file://mtcdt-fpga-v31.hex  file://mtcdt-fpga-v33.hex"
+=======
+SRC_URI = "git://git.multitech.net/mts-id-eeprom.git;protocol=git"
+SRC_URI_append_mtcdt = " file://mtcdt-fpga-v31.hex  file://mtcdt-fpga-v35.hex"
+>>>>>>> cf4351d... update mts-id-eeprom to 0.5.2 on ext git, add v35 FPGA for MTAC-LORA-H
 SRC_URI_append_mtcap = " file://mtcap-fpga-v31.hex  file://mtcap-fpga-v33.hex"
 
 S = "${WORKDIR}/git"
@@ -33,22 +38,20 @@ PARALLEL_MAKE = ""
 FILES_${PN}_append_mtcap += "${sbindir}/mts-fpga-loader-1_5"
 FILES_${PN}_append_mtcdt += "${sbindir}/mts-fpga-loader-1_5"
 FILES_${PN}_append_mtcap += "${libdir}/mts-flash-binaries/mtcap-fpga-v31.hex ${libdir}/mts-flash-binaries/mtcap-fpga-v33.hex "
-FILES_${PN}_append_mtcdt += "${libdir}/mts-flash-binaries/mtcdt-fpga-v31.hex ${libdir}/mts-flash-binaries/mtcdt-fpga-v33.hex "
+FILES_${PN}_append_mtcdt += "${libdir}/mts-flash-binaries/mtcdt-fpga-v31.hex ${libdir}/mts-flash-binaries/mtcdt-fpga-v35.hex "
 
 
 
 fakeroot do_install_append_mtcap() {
-    # install MTCAP mts-io init script
     install -d -m 0755 ${D}${libdir}/mts-flash-binaries
     install -m 0444 ${WORKDIR}/${MACHINE}-fpga-v31.hex  ${D}${libdir}/mts-flash-binaries
     install -m 0444 ${WORKDIR}/${MACHINE}-fpga-v33.hex  ${D}${libdir}/mts-flash-binaries
 }
 
 fakeroot do_install_append_mtcdt() {
-    # install MTCAP mts-io init script
     install -d -m 0755 ${D}${libdir}/mts-flash-binaries
     install -m 0444 ${WORKDIR}/${MACHINE}-fpga-v31.hex  ${D}${libdir}/mts-flash-binaries
-    install -m 0444 ${WORKDIR}/${MACHINE}-fpga-v33.hex  ${D}${libdir}/mts-flash-binaries
+    install -m 0444 ${WORKDIR}/${MACHINE}-fpga-v35.hex  ${D}${libdir}/mts-flash-binaries
 }
 
 
diff --git a/recipes-bsp/multitech/mts-id-eeprom_0.4.7.bb b/recipes-bsp/multitech/mts-id-eeprom_0.4.7.bb
deleted file mode 100644
index ccf3521..0000000
--- a/recipes-bsp/multitech/mts-id-eeprom_0.4.7.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require mts-id-eeprom.inc
-
-PR = "${INC_PR}.0"
diff --git a/recipes-bsp/multitech/mts-id-eeprom_0.5.2.bb b/recipes-bsp/multitech/mts-id-eeprom_0.5.2.bb
new file mode 100644
index 0000000..ccf3521
--- /dev/null
+++ b/recipes-bsp/multitech/mts-id-eeprom_0.5.2.bb
@@ -0,0 +1,3 @@
+require mts-id-eeprom.inc
+
+PR = "${INC_PR}.0"
-- 
cgit v1.2.3