summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Reiss <jreiss@multitech.com>2020-06-09 08:33:00 -0500
committerJohn Klug <john.klug@multitech.com>2020-11-11 17:15:56 -0600
commit5058ffaad9f2094dff5828e3aa65d54d2988f3c2 (patch)
treeeebdf48b1c411e5144a36b68ba3b74b0a520616d
parentebbd85ec2e966bcab5631c37fd91a072d1913068 (diff)
downloadmeta-multitech-5058ffaad9f2094dff5828e3aa65d54d2988f3c2.tar.gz
meta-multitech-5058ffaad9f2094dff5828e3aa65d54d2988f3c2.tar.bz2
meta-multitech-5058ffaad9f2094dff5828e3aa65d54d2988f3c2.zip
update mts-id-eeprom to 0.5.2 on ext git, add v35 FPGA for MTAC-LORA-H
-rw-r--r--recipes-bsp/multitech/mts-id-eeprom.inc11
-rw-r--r--recipes-bsp/multitech/mts-id-eeprom_0.5.2.bb (renamed from recipes-bsp/multitech/mts-id-eeprom_0.4.7.bb)0
2 files changed, 7 insertions, 4 deletions
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.5.2.bb
index ccf3521..ccf3521 100644
--- a/recipes-bsp/multitech/mts-id-eeprom_0.4.7.bb
+++ b/recipes-bsp/multitech/mts-id-eeprom_0.5.2.bb