SFU: move ota partition at the end of flash

Author: facchinm

libraries/SFU/extra/main.cpp

@@ -9,14 +9,15 @@
 #define FULL_UPDATE_FILE_PATH   "/" SD_MOUNT_PATH "/" MBED_CONF_APP_UPDATE_FILE
 
 #define POST_APPLICATION_ADDR   0x10000
+#define VERSION                 1
 
 #if !defined(POST_APPLICATION_ADDR)
 #error "target.restrict_size must be set for your target in mbed_app.json"
 #endif
 
 //Pin order: MOSI, MISO, SCK, CS
-//FlashIAPBlockDevice sd(XIP_BASE + 0xF00000, 0x100000);
-FlashIAPBlockDevice sd(XIP_BASE + 0x100000, 0x100000);
+FlashIAPBlockDevice sd(XIP_BASE + 0xF00000, 0x100000);
+//FlashIAPBlockDevice sd(XIP_BASE + 0x100000, 0x100000);
 FATFileSystem fs(SD_MOUNT_PATH);
 FlashIAP flash;
 

libraries/SFU/extra/mbed-os.lib

@@ -1 +1 @@
-https://github.com/arduino/mbed-os/#1820aade78cbc3e3231def2c3ffd0b363bf1778c
+https://github.com/arduino/mbed-os/#45445a4b76d8d05d6083f8bf481e5b4efe7bf1c7

libraries/SFU/src/SFU.cpp

@@ -1,22 +1,34 @@
 #include "SFU.h"
 #include "FlashIAPBlockDevice.h"
 #include "FATFileSystem.h"
-//#include "PluggableUSBMSD.h"
+#include "PluggableUSBMSD.h"
 
 const unsigned char SFU[0x10000] __attribute__ ((section(".second_stage_ota"), used)) = {
 	#include "rp2040.h"
 };
 
-FlashIAPBlockDevice bd(XIP_BASE + 0x100000, 0x100000);
-static mbed::FATFileSystem fs("ota");
+FlashIAPBlockDevice bd(XIP_BASE + 0xF00000, 0x100000);
 
-int SFU::begin() {
-	int err = fs.mount(&bd);
-	if (err) {
-        err = fs.reformat(&bd);
+void USBMSD::begin()
+{
+    int err = getFileSystem().mount(&bd);
+    if (err) {
+        err = getFileSystem().reformat(&bd);
     }
 }
 
+mbed::FATFileSystem& USBMSD::getFileSystem()
+{
+	static mbed::FATFileSystem fs("ota");
+	return fs;
+}
+
+USBMSD MassStorage(&bd);
+
+int SFU::begin() {
+	MassStorage.begin();
+}
+
 int SFU::download(const char* url) {
 	// No download at the moment, allow the user to upload a file via mass storage
 }