Merge pull request #563 from facchinm/qspi_subclassing

[Portenta] Finally fix RTC drift and read proper information from the board

Author: facchinm

bootloaders/PORTENTA_H7/portentah7_bootloader_mbed_hs_v2.bin

@@ -340,9 +340,11 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
         QSPIF_BP_CLEAR_SR, // Clear protection bits in status register 1
     };
 
+protected:
     // QSPI Driver Object
     mbed::QSPI _qspi;
 
+private:
     // Static List of different QSPI based Flash devices csel that already exist
     // Each QSPI Flash device csel can have only 1 QSPIFBlockDevice instance
     // _devices_mutex is used to lock csel list - only one QSPIFBlockDevice instance per csel is allowed

bootloaders/PORTENTA_H7/portentah7_bootloader_mbed_hs_v2.elf

@@ -1,6 +1,12 @@
 uint8_t* bootloader_data = (uint8_t*)(0x801F000);
 uint8_t* bootloader_identification = (uint8_t*)(0x80002F0);
 
+#if __has_include("portenta_info.h")
+#include "portenta_info.h"
+#define GET_OTP_BOARD_INFO
+uint8_t* boardInfo();
+#endif
+
 void setup() {  
   Serial.begin(115200);
   while (!Serial) {}
@@ -23,6 +29,20 @@ void setup() {
   Serial.println("QSPI size: " + String(bootloader_data[7]) + " MB");
   Serial.println("Has Video output: " + String(bootloader_data[8] == 1 ? "Yes" : "No"));
   Serial.println("Has Crypto chip: " + String(bootloader_data[9] == 1 ? "Yes" : "No"));
+
+#ifdef GET_OTP_BOARD_INFO
+  auto info = *((PortentaBoardInfo*)boardInfo());
+  if (info.magic == 0xB5) {
+    Serial.println("Secure info version: " + String(info.version));
+    Serial.println("Secure board revision: " + String(info.revision >> 8) + "." + String(info.revision & 0xFF));
+    Serial.println("Secure carrier identification: " + String(info.carrier >> 8) + "." + String(info.revision & 0xFF));
+    Serial.println("Secure vid: 0x" + String(info.vid, HEX));
+    Serial.println("Secure pid: 0x" + String(info.pid, HEX));
+    Serial.println("Secure mac: " + String(info.mac_address[0], HEX) + ":" + String(info.mac_address[1], HEX) + ":" +
+                                    String(info.mac_address[2], HEX) + ":" + String(info.mac_address[3], HEX) + ":" +
+                                    String(info.mac_address[4], HEX) + ":" + String(info.mac_address[5], HEX));
+  }
+#endif
 }
 
 String getUSBSpeed(uint8_t flag) {

cores/arduino/mbed/storage/blockdevice/COMPONENT_QSPIF/include/QSPIF/QSPIFBlockDevice.h

@@ -4,12 +4,14 @@
 #include "LittleFileSystem.h"
 #include "FATFileSystem.h"
 #if defined(ARDUINO_PORTENTA_H7_M7)
+#include "portenta_info.h"
 #include "portenta_bootloader.h"
 #include "portenta_lite_bootloader.h"
 #include "portenta_lite_connected_bootloader.h"
 #include "mcuboot_bootloader.h"
 #include "ecdsa-p256-encrypt-key.h"
 #include "ecdsa-p256-signing-key.h"
+#define GET_OTP_BOARD_INFO
 #elif defined(ARDUINO_NICLA_VISION)
 #include "nicla_vision_bootloader.h"
 #endif
@@ -42,6 +44,8 @@ uint8_t* bootloader_identification = (uint8_t*)(BOOTLOADER_ADDR + bootloader_ide
 const unsigned char* bootloader_ptr = &bootloader_mbed_bin[0];
 long bootloader_len = bootloader_mbed_bin_len;
 
+uint8_t* boardInfo();
+
 void setup() {
   Serial.begin(115200);
   while (!Serial) {}
@@ -65,6 +69,20 @@ void setup() {
   Serial.println("Has Video output: " + String(bootloader_data[8] == 1 ? "Yes" : "No"));
   Serial.println("Has Crypto chip: " + String(bootloader_data[9] == 1 ? "Yes" : "No"));
 
+#ifdef GET_OTP_BOARD_INFO
+  auto info = *((PortentaBoardInfo*)boardInfo());
+  if (info.magic == 0xB5) {
+    Serial.println("Secure info version: " + String(info.version));
+    Serial.println("Secure board revision: " + String(info.revision >> 8) + "." + String(info.revision & 0xFF));
+    Serial.println("Secure carrier identification: " + String(info.carrier >> 8) + "." + String(info.revision & 0xFF));
+    Serial.println("Secure vid: 0x" + String(info.vid, HEX));
+    Serial.println("Secure pid: 0x" + String(info.pid, HEX));
+    Serial.println("Secure mac: " + String(info.mac_address[0], HEX) + ":" + String(info.mac_address[1], HEX) + ":" +
+                                    String(info.mac_address[2], HEX) + ":" + String(info.mac_address[3], HEX) + ":" +
+                                    String(info.mac_address[4], HEX) + ":" + String(info.mac_address[5], HEX));
+  }
+#endif
+
   video_available = bootloader_data[8];
   wifi_available = bootloader_data[5];
 

libraries/STM32H747_System/examples/STM32H747_getBootloaderInfo/STM32H747_getBootloaderInfo.ino

@@ -3,6 +3,7 @@
 #include "Portenta_System.h"
 #include "Wire.h"
 #include "mbed.h"
+#include "SecureQSPI.h"
 
 #define PMIC_ADDRESS 0x08
 

libraries/STM32H747_System/examples/STM32H747_manageBootloader/STM32H747_manageBootloader.ino

@@ -12,6 +12,8 @@ class Portenta_System: public STM32H747
   Portenta_System() {};
   virtual bool begin();
   virtual bool enterLowPower();
+  String getBoardRevision();
+  uint16_t getCarrierSpecs();
 };
 
 }