Partition check

Kconfig

@@ -1,5 +1,11 @@
 menu "RevK"
 
+	config REVK_PARTITION_CHECK
+        bool "Check and update partition table"
+        default y
+        help
+		Enable automatic checking of partition table, and update if necessary
+
 	config REVK_APPNAME
 	string "Override app name"
 	default ""

component.mk

@@ -3,3 +3,5 @@
 #
 # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
 
+COMPONENT_EMBED_FILES := ../build/partitions_4m.bin
+

partitions_2ota.csv → partitions_4m.csv

@@ -5,3 +5,4 @@ phy_init, data, phy,     0xf000,  0x1000,
 ota_0,	  0,    ota_0,   ,        0x1f0000,
 ota_1,	  0,    ota_1,   ,        0x1f0000,
 nvs,      data, nvs,     ,  	  0xC000,
+nvs_key,  data, nvs_keys,,	  0x1000,

revk.c

@@ -407,6 +407,33 @@ task (void *pvParameters)
 void
 revk_init (app_command_t * app_command_cb)
 {                               // Start the revk task, use __FILE__ and __DATE__ and __TIME__ to set task name and version ID
+#ifdef	CONFIG_REVK_PARTITION_CHECK
+   extern const uint8_t part_start[] asm ("_binary_partitions_4m_bin_start");
+   extern const uint8_t part_end[] asm ("_binary_partitions_4m_bin_end");
+   // Check and update partition table - expects some code to stay where it can run, i.e. 0x10000, but may clear all settings
+   if ((part_end - part_start) > SPI_FLASH_SEC_SIZE)
+   {
+      ESP_LOGE (TAG, "Block size error (%d>%d)", part_end - part_start, SPI_FLASH_SEC_SIZE);
+      return;
+   }
+   esp_err_t e;
+   uint8_t *mem = malloc (SPI_FLASH_SEC_SIZE);
+   if (!mem)
+   {
+      ESP_LOGE (TAG, "Malloc fail: %d", SPI_FLASH_SEC_SIZE);
+      return;
+   }
+   ESP_ERROR_CHECK (spi_flash_read (CONFIG_PARTITION_TABLE_OFFSET, mem, SPI_FLASH_SEC_SIZE));
+   if (memcmp (mem, part_start, part_end - part_start))
+   {
+      memset (mem, 0, SPI_FLASH_SEC_SIZE);
+      memcpy (mem, part_start, part_end - part_start);
+      ESP_ERROR_CHECK (spi_flash_erase_range (CONFIG_PARTITION_TABLE_OFFSET, SPI_FLASH_SEC_SIZE));
+      ESP_ERROR_CHECK (spi_flash_write (CONFIG_PARTITION_TABLE_OFFSET, mem, SPI_FLASH_SEC_SIZE));
+      esp_restart ();
+   }
+   free (mem);
+#endif
    nvs_flash_init ();
    const esp_app_desc_t *app = esp_ota_get_app_description ();
    ESP_ERROR_CHECK (nvs_open (TAG, NVS_READWRITE, &nvs));       // RevK settings