From 101ddd6152b1a04e02260b1063873fdfa669cc92 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sun, 2 Oct 2022 18:04:47 -0400 Subject: [PATCH] add ARM64 cross compiler arch; fix buffer offset issue when dumping contents of modem flash; --- Makefile | 3 +++ host/calibrate/HostCal.cpp | 2 +- modem/Modem.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 48f22a05..76b8cc92 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ STRIP = strip armCC = arm-linux-gnueabihf-gcc armCXX = arm-linux-gnueabihf-g++ armSTRIP = arm-linux-gnueabihf-strip +aarch64CC = aarch64-linux-gnu-gcc +aarch64CXX = aarch64-linux-gnu-g++ +aarch64STRIP= aarch64-linux-gnu-strip rpi-armCC = /opt/tools/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc rpi-armCXX = /opt/tools/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-g++ rpi-armSTRIP= /opt/tools/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-gnueabihf-strip diff --git a/host/calibrate/HostCal.cpp b/host/calibrate/HostCal.cpp index 1e0de877..347097d5 100644 --- a/host/calibrate/HostCal.cpp +++ b/host/calibrate/HostCal.cpp @@ -1327,7 +1327,7 @@ bool HostCal::portModemHandler(Modem* modem, uint32_t ms, RESP_TYPE_DVM rspType, { uint8_t len = buffer[1U]; if (m_debug) { - Utils::dump(1U, "Modem Flash Contents", buffer, len); + Utils::dump(1U, "Modem Flash Contents", buffer + 3U, len - 3U); } if (len == 249U) { bool ret = edac::CRC::checkCCITT162(buffer + 3U, DVM_CONF_AREA_LEN); diff --git a/modem/Modem.cpp b/modem/Modem.cpp index 8862aa50..6a56a102 100644 --- a/modem/Modem.cpp +++ b/modem/Modem.cpp @@ -2161,7 +2161,7 @@ bool Modem::readFlash() if (resp == RTM_OK && m_buffer[2U] == CMD_FLSH_READ) { uint8_t len = m_buffer[1U]; if (m_debug) { - Utils::dump(1U, "Modem Flash Contents", m_buffer, len); + Utils::dump(1U, "Modem Flash Contents", m_buffer + 3U, len - 3U); } if (len == 249U) {