Uses Internal flash for system settings storage repourposing external flash for "User" storage

flight/targets/boards/osd/board-info.mk

@@ -24,7 +24,8 @@ OPENOCD_CONFIG      := stm32f4xx.stlink.cfg
 # 6			0x0804 0000		128k	FW
 # 7 		0x0806 0000		128k	FW
 # 8 		0x0808 0000		128k	Unused
-# ..								..
+# 9			0x080A 0000		128k	Unused
+# 10		0x080C 0000		128k	Unused						..
 # 11		0x080E 0000		128k   	Unused
 
 # Note: These must match the values in link_$(BOARD)_memory.ld

flight/targets/boards/osd/firmware/Makefile

@@ -100,8 +100,6 @@ else
     SRC += $(OPTESTS)/$(TESTAPP).c
 endif
 
-CDEFS += -DEE_BANK_BASE=$(EE_BANK_BASE)
-CDEFS += -DEE_BANK_SIZE=$(EE_BANK_SIZE)
 
 	
 # Optional component libraries

flight/targets/boards/revolution/board-info.mk

@@ -12,11 +12,31 @@ MODEL_SUFFIX        :=
 OPENOCD_JTAG_CONFIG := stlink-v2.cfg
 OPENOCD_CONFIG      := stm32f4xx.stlink.cfg
 
+# Flash memory map for Revolution:
+# Sector	start			size	use
+# 0			0x0800 0000		16k		BL
+# 1			0x0800 4000		16k		BL
+# 2			0x0800 8000		16k		EE
+# 3			0x0800 C000		16k		EE
+# 4			0x0801 0000		64k		Unused
+# 5			0x0802 0000		128k	FW
+# 6			0x0804 0000		128k	FW
+# 7 		0x0806 0000		128k	FW
+# 8 		0x0808 0000		128k	Unused
+# 9			0x080A 0000		128k	Unused
+# 10		0x080C 0000		128k	Unused						..
+# 11		0x080E 0000		128k   	Unused
+
 # Note: These must match the values in link_$(BOARD)_memory.ld
 BL_BANK_BASE        := 0x08000000  # Start of bootloader flash
 BL_BANK_SIZE        := 0x00008000  # Should include BD_INFO region
 
-# Leave the remaining 16KB and 64KB sectors for other uses
+# 16KB for settings storage
+
+EE_BANK_BASE        := 0x08008000  # EEPROM storage area
+EE_BANK_SIZE        := 0x00008000  # Size of EEPROM storage area
+
+# Leave the remaining 64KB sectors for other uses
 
 FW_BANK_BASE        := 0x08020000  # Start of firmware flash
 FW_BANK_SIZE        := 0x00060000  # Should include FW_DESC_SIZE

flight/targets/boards/revolution/board_hw_defs.c

@@ -665,8 +665,9 @@ const struct pios_rfm22b_cfg * PIOS_BOARD_HW_DEFS_GetRfm22Cfg (uint32_t board_re
 #if defined(PIOS_INCLUDE_FLASH)
 #include "pios_flashfs_logfs_priv.h"
 #include "pios_flash_jedec_priv.h"
+#include "pios_flash_internal_priv.h"
 
-static const struct flashfs_logfs_cfg flashfs_m25p_cfg = {
+static const struct flashfs_logfs_cfg flashfs_external_cfg = {
 	.fs_magic      = 0x99abceef,
 	.total_fs_size = 0x00200000, /* 2M bytes (32 sectors = entire chip) */
 	.arena_size    = 0x00010000, /* 256 * slot size */
@@ -677,6 +678,20 @@ static const struct flashfs_logfs_cfg flashfs_m25p_cfg = {
 	.page_size     = 0x00000100, /* 256 bytes */
 };
 
+
+static const struct pios_flash_internal_cfg flash_internal_cfg = { };
+
+static const struct flashfs_logfs_cfg flashfs_internal_cfg = {
+.fs_magic = 0x99abcfef,
+.total_fs_size = EE_BANK_SIZE, /* 32K bytes (2x16KB sectors) */
+.arena_size = 0x00004000, /* 64 * slot size = 16K bytes = 1 sector */
+.slot_size = 0x00000100, /* 256 bytes */
+
+.start_offset = EE_BANK_BASE, /* start after the bootloader */
+.sector_size = 0x00004000, /* 16K bytes */
+.page_size = 0x00004000, /* 16K bytes */
+};
+
 #endif	/* PIOS_INCLUDE_FLASH */
 
 #include <pios_usart_priv.h>

flight/targets/boards/revolution/firmware/inc/pios_config.h

@@ -106,6 +106,7 @@
 /* #define PIOS_INCLUDE_SDCARD */
 /* #define LOG_FILENAME "startup.log" */
 #define PIOS_INCLUDE_FLASH
+#define PIOS_INCLUDE_FLASH_INTERNAL
 #define PIOS_INCLUDE_FLASH_SECTOR_SETTINGS
 #define FLASH_FREERTOS
 /* #define PIOS_INCLUDE_FLASH_EEPROM */

flight/targets/boards/revolution/firmware/pios_board.c

@@ -236,6 +236,7 @@ uint32_t pios_rfm22b_id = 0;
 #endif
 
 uintptr_t pios_uavo_settings_fs_id;
+uintptr_t pios_user_fs_id;
 
 /* 
  * Setup a com port based on the passed cfg, driver and buffer sizes. tx size of -1 make the port rx only
@@ -350,11 +351,22 @@ void PIOS_Board_Init(void) {
 #if defined(PIOS_INCLUDE_FLASH)
 	/* Connect flash to the appropriate interface and configure it */
 	uintptr_t flash_id;
+
+	// initialize the internal settings storage flash
+	if (PIOS_Flash_Internal_Init(&flash_id, &flash_internal_cfg)) {
+	        PIOS_DEBUG_Assert(0);
+	}
+
+	if (PIOS_FLASHFS_Logfs_Init(&pios_uavo_settings_fs_id, &flashfs_internal_cfg, &pios_internal_flash_driver, flash_id)) {
+	                PIOS_DEBUG_Assert(0);
+	}
+
+	// Initialize the external USER flash
 	if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_telem_flash_id, 1)) {
 		PIOS_DEBUG_Assert(0);
 	}
 
-	if (PIOS_FLASHFS_Logfs_Init(&pios_uavo_settings_fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) {
+	if (PIOS_FLASHFS_Logfs_Init(&pios_user_fs_id, &flashfs_external_cfg, &pios_jedec_flash_driver, flash_id)) {
 	            PIOS_DEBUG_Assert(0);
 	}
 

flight/targets/boards/revoproto/board-info.mk

@@ -16,7 +16,12 @@ OPENOCD_CONFIG      := stm32f4xx.stlink.cfg
 BL_BANK_BASE        := 0x08000000  # Start of bootloader flash
 BL_BANK_SIZE        := 0x00008000  # Should include BD_INFO region
 
-# Leave the remaining 16KB and 64KB sectors for other uses
+# 16KB for settings storage
+
+EE_BANK_BASE        := 0x08008000  # EEPROM storage area
+EE_BANK_SIZE        := 0x00008000  # Size of EEPROM storage area
+
+# Leave the remaining 64KB sectors for other uses
 
 FW_BANK_BASE        := 0x08020000  # Start of firmware flash
 FW_BANK_SIZE        := 0x00060000  # Should include FW_DESC_SIZE

flight/targets/boards/revoproto/board_hw_defs.c

@@ -448,8 +448,9 @@ void PIOS_SPI_flash_irq_handler(void)
 #if defined(PIOS_INCLUDE_FLASH)
 #include "pios_flashfs_logfs_priv.h"
 #include "pios_flash_jedec_priv.h"
+#include "pios_flash_internal_priv.h"
 
-static const struct flashfs_logfs_cfg flashfs_m25p_cfg = {
+static const struct flashfs_logfs_cfg flashfs_external_cfg = {
     .fs_magic      = 0x99abceef,
     .total_fs_size = 0x00200000, /* 2M bytes (32 sectors = entire chip) */
     .arena_size    = 0x00010000, /* 256 * slot size */
@@ -460,6 +461,20 @@ static const struct flashfs_logfs_cfg flashfs_m25p_cfg = {
     .page_size     = 0x00000100, /* 256 bytes */
 };
 
+
+static const struct pios_flash_internal_cfg flash_internal_cfg = { };
+
+static const struct flashfs_logfs_cfg flashfs_internal_cfg = {
+.fs_magic = 0x99abcfef,
+.total_fs_size = EE_BANK_SIZE, /* 32K bytes (2x16KB sectors) */
+.arena_size = 0x00004000, /* 64 * slot size = 16K bytes = 1 sector */
+.slot_size = 0x00000100, /* 256 bytes */
+
+.start_offset = EE_BANK_BASE, /* start after the bootloader */
+.sector_size = 0x00004000, /* 16K bytes */
+.page_size = 0x00004000, /* 16K bytes */
+};
+
 #endif	/* PIOS_INCLUDE_FLASH */
 
 #if defined(PIOS_OVERO_SPI)

flight/targets/boards/revoproto/firmware/inc/pios_config.h

@@ -106,6 +106,7 @@
 /* #define PIOS_INCLUDE_SDCARD */
 /* #define LOG_FILENAME "startup.log" */
 #define PIOS_INCLUDE_FLASH
+#define PIOS_INCLUDE_FLASH_INTERNAL
 #define PIOS_INCLUDE_FLASH_SECTOR_SETTINGS
 #define FLASH_FREERTOS
 /* #define PIOS_INCLUDE_FLASH_EEPROM */

flight/targets/boards/revoproto/firmware/pios_board.c

@@ -306,6 +306,8 @@ uint32_t pios_com_overo_id = 0;
 uint32_t pios_com_hkosd_id = 0;
 
 uintptr_t pios_uavo_settings_fs_id;
+uintptr_t pios_user_fs_id;
+
 
 /* 
  * Setup a com port based on the passed cfg, driver and buffer sizes. tx size of -1 make the port rx only
@@ -378,6 +380,18 @@ void PIOS_Board_Init(void) {
 
 	PIOS_LED_Init(&pios_led_cfg);
 
+    /* Connect flash to the appropriate interface and configure it */
+    uintptr_t flash_id;
+
+    // initialize the internal settings storage flash
+    if (PIOS_Flash_Internal_Init(&flash_id, &flash_internal_cfg)) {
+            PIOS_DEBUG_Assert(0);
+    }
+
+    if (PIOS_FLASHFS_Logfs_Init(&pios_uavo_settings_fs_id, &flashfs_internal_cfg, &pios_internal_flash_driver, flash_id)) {
+                    PIOS_DEBUG_Assert(0);
+    }
+
 	/* Set up the SPI interface to the accelerometer*/
 	if (PIOS_SPI_Init(&pios_spi_accel_id, &pios_spi_accel_cfg)) {
 		PIOS_DEBUG_Assert(0);
@@ -392,19 +406,18 @@ void PIOS_Board_Init(void) {
 	if (PIOS_SPI_Init(&pios_spi_flash_id, &pios_spi_flash_cfg)) {
 		PIOS_DEBUG_Assert(0);
 	}
+
 	/* Connect flash to the appropriate interface and configure it */
-	uintptr_t flash_id;
 	if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_flash_id, 0)) {
 		PIOS_DEBUG_Assert(0);
 	}
 #else
 	/* Connect flash to the appropriate interface and configure it */
-	uintptr_t flash_id;
 	if (PIOS_Flash_Jedec_Init(&flash_id, pios_spi_accel_id, 1)) {
 		PIOS_DEBUG_Assert(0);
 	}
 #endif
-	if (PIOS_FLASHFS_Logfs_Init(&pios_uavo_settings_fs_id, &flashfs_m25p_cfg, &pios_jedec_flash_driver, flash_id)) {
+    if (PIOS_FLASHFS_Logfs_Init(&pios_user_fs_id, &flashfs_external_cfg, &pios_jedec_flash_driver, flash_id)) {
         PIOS_DEBUG_Assert(0);
     }
 

make/common-defs.mk

@@ -137,6 +137,8 @@ BOARD_CDEFS += -DBL_BANK_BASE=$(BL_BANK_BASE)
 BOARD_CDEFS += -DBL_BANK_SIZE=$(BL_BANK_SIZE)
 BOARD_CDEFS += -DBL_DESC_SIZE=$(BL_DESC_SIZE)
 
+BOARD_CDEFS += -DEE_BANK_BASE=$(EE_BANK_BASE)
+BOARD_CDEFS += -DEE_BANK_SIZE=$(EE_BANK_SIZE)
 CDEFS += $(BOARD_CDEFS)
 
 ifeq ($(DEBUG), YES)