PYFW-377: Updated OTA partitions offsets according to flash Size - 1.18.3

Author: husigeza

esp32/application.mk

@@ -168,6 +168,7 @@ APP_UTIL_SRC_C = $(addprefix util/,\
 	mpirq.c \
 	mpsleep.c \
 	timeutils.c \
+	esp32chipinfo.c \
 	)
 
 APP_FATFS_SRC_C = $(addprefix fatfs/src/,\

esp32/bootloader/bootloader.h

@@ -41,25 +41,17 @@ typedef struct _boot_info_t
   uint32_t  crc;
 } boot_info_t;
 
-#if defined (FIPY) || defined (GPY) || defined (LOPY4) || defined(WIPY3)
+#define IMG_SIZE_8MB                        (1980 * 1024)
+#define IMG_UPDATE1_OFFSET_8MB              (2112 * 1024)  // taken from the partitions table
+#define OTA_DATA_ADDRESS_8MB                (0x1FF000)     // calculated from partitions table
 
-#define IMG_SIZE                            (1980 * 1024)
-#define OTAA_DATA_SIZE                      (4 * 1024)
-#define OTA_DATA_INDEX                      2
-#define IMG_FACTORY_OFFSET                  (64 * 1024)
-#define IMG_UPDATE1_OFFSET                  (2112 * 1024)  // taken from the partitions table
-#define OTA_DATA_ADDRESS                    (0x1FF000)
+#define IMG_SIZE_4MB                        (1720 * 1024)
+#define IMG_UPDATE1_OFFSET_4MB              (1792 * 1024)  // taken from the partitions table
+#define OTA_DATA_ADDRESS_4MB                (0x1BE000)     // calculated from partitions table
 
-#else
-
-#define IMG_SIZE                            (1720 * 1024)
 #define OTAA_DATA_SIZE                      (4 * 1024)
 #define OTA_DATA_INDEX                      2
 #define IMG_FACTORY_OFFSET                  (64 * 1024)
-#define IMG_UPDATE1_OFFSET                  (1792 * 1024)  // taken from the partitions table
-#define OTA_DATA_ADDRESS                    (0x1BE000)
-
-#endif
 
 #define IMG_UPDATE2_OFFSET                  (IMG_FACTORY_OFFSET)
 
@@ -73,7 +65,8 @@ typedef struct _boot_info_t
 #define BOOT_VERSION                        "V0.2"
 #define SPI_SEC_SIZE                        0x1000
 
-#define PARTITIONS_COUNT                    7
+#define PARTITIONS_COUNT_8MB                5
+#define PARTITIONS_COUNT_4MB                7
 
 #define PART_TYPE_APP                       0x00
 #define PART_SUBTYPE_FACTORY                0x00

esp32/fatfs/src/drivers/sflash_diskio.c

@@ -14,6 +14,7 @@
 
 #include "esp_spi_flash.h"
 #include "esp_flash_encrypt.h"
+#include "esp32chipinfo.h"
 
 static uint8_t *sflash_block_cache;
 static bool sflash_cache_is_dirty;
@@ -43,7 +44,7 @@ static bool sflash_write (void) {
 DRESULT sflash_disk_init (void) {
     if (!sflash_init_done) {
         // this is how we diferentiate flash sizes in Pycom modules
-        if (esp_get_revision() > 0) {
+        if (esp32_get_chip_rev() > 0) {
             sflash_start_address = SFLASH_START_ADDR_8MB;
             sflash_fs_sector_count = SFLASH_FS_SECTOR_COUNT_8MB;
         } else {

esp32/ftp/updater.c

@@ -21,6 +21,7 @@
 //#define LOG_LOCAL_LEVEL ESP_LOG_INFO
 #include "esp_log.h"
 #include "rom/crc.h"
+#include "esp32chipinfo.h"
 
 #include "ff.h"
 
@@ -78,11 +79,13 @@ static esp_err_t updater_spi_flash_write(size_t dest_addr, void *src, size_t siz
  ******************************************************************************/
 
 bool updater_read_boot_info (boot_info_t *boot_info, uint32_t *boot_info_offset) {
-    esp_partition_info_t partition_info[PARTITIONS_COUNT];
+    esp_partition_info_t partition_info[PARTITIONS_COUNT_4MB];
+
+    uint8_t part_count = (esp32_get_chip_rev() > 0 ? PARTITIONS_COUNT_8MB : PARTITIONS_COUNT_4MB);
 
     ESP_LOGV(TAG, "Reading boot info\n");
 
-    if (ESP_OK != updater_spi_flash_read(ESP_PARTITION_TABLE_ADDR, (void *)partition_info, sizeof(partition_info), true)) {
+    if (ESP_OK != updater_spi_flash_read(ESP_PARTITION_TABLE_ADDR, (void *)partition_info, (sizeof(esp_partition_info_t) * part_count), true)) {
             ESP_LOGE(TAG, "err1\n");
             return false;
     }
@@ -175,15 +178,27 @@ bool updater_start (void) {
      * The new location of otadata is 0x1BE000 or 0x1FF000 as per updated partition table and has size of
      * 4096 bytes which is size of a sector
      */
-    ret = spi_flash_erase_sector(OTA_DATA_ADDRESS / SPI_FLASH_SEC_SIZE);
+    if (esp32_get_chip_rev() > 0) {
+        ret = spi_flash_erase_sector(OTA_DATA_ADDRESS_8MB / SPI_FLASH_SEC_SIZE);
+    }
+    else {
+        ret = spi_flash_erase_sector(OTA_DATA_ADDRESS_4MB / SPI_FLASH_SEC_SIZE);
+    }
     if (ESP_OK != ret) {
         ESP_LOGE(TAG, "Erasing new sector of boot info failed, error code: %d!\n", ret);
         // TODO: try again ???
         return false;
     }
 
     // Updating the NEW otadata partition with the OLD information
-    if (true != updater_write_boot_info(&boot_info_local, OTA_DATA_ADDRESS)) {
+    bool updater_ret = false;
+    if (esp32_get_chip_rev() > 0) {
+        updater_ret = updater_write_boot_info(&boot_info_local, OTA_DATA_ADDRESS_8MB);
+    }
+    else {
+        updater_ret = updater_write_boot_info(&boot_info_local, OTA_DATA_ADDRESS_4MB);
+    }
+    if (true != updater_ret) {
         ESP_LOGE(TAG, "Writing new sector of boot info failed!\n");
         //TODO: try again ???
         return false;
@@ -198,7 +213,7 @@ bool updater_start (void) {
     }
 
     // Writing the new partition table
-    if (esp_get_revision() > 0) {
+    if (esp32_get_chip_rev() > 0) {
         ret = spi_flash_write(ESP_PARTITION_TABLE_ADDR, (void *)partitions_bin_8MB, sizeof(partitions_bin_8MB));
     }
     else {
@@ -210,7 +225,7 @@ bool updater_start (void) {
         return false;
     }
 
-    updater_data.size = IMG_SIZE;
+    updater_data.size = (esp32_get_chip_rev() > 0 ? IMG_SIZE_8MB : IMG_SIZE_4MB);
     // check which one should be the next active image
     updater_data.offset = updater_ota_next_slot_address();
 
@@ -356,7 +371,7 @@ bool updater_write_boot_info(boot_info_t *boot_info, uint32_t boot_info_offset)
 
 int updater_ota_next_slot_address() {
 
-    int ota_offset = IMG_UPDATE1_OFFSET;
+    int ota_offset = (esp32_get_chip_rev() > 0 ? IMG_UPDATE1_OFFSET_8MB : IMG_UPDATE1_OFFSET_4MB);;
 
     // check which one should be the next active image
     if (updater_read_boot_info (&boot_info, &boot_info_offset)) {

esp32/main.c

@@ -51,6 +51,7 @@
 #include "pins.h"
 #include "mperror.h"
 #include "machtimer.h"
+#include "esp32chipinfo.h"
 
 
 TaskHandle_t mpTaskHandle;
@@ -104,6 +105,8 @@ static StaticTask_t mpTaskTCB;
  * Returns      : none
 *******************************************************************************/
 void app_main(void) {
+
+    esp32_init_chip_info();
     // remove all the logs from the IDF
     esp_log_level_set("*", ESP_LOG_NONE);
 
@@ -123,15 +126,15 @@ void app_main(void) {
     mperror_pre_init();
 
     // differentiate the Flash Size (either 8MB or 4MB) based on ESP32 rev id
-    micropy_hw_flash_size = (esp_get_revision() > 0 ? 0x800000 : 0x400000);
+    micropy_hw_flash_size = (esp32_get_chip_rev() > 0 ? 0x800000 : 0x400000);
 
     // propagating the Flash Size in the global variable (used in multiple IDF modules)
     g_rom_flashchip.chip_size = micropy_hw_flash_size;
 
     esp_chip_info_t chip_info;
     esp_chip_info(&chip_info);
 
-    if (chip_info.revision > 0) {
+    if (esp32_get_chip_rev() > 0) {
         micropy_hw_antenna_diversity_pin_num = MICROPY_SECOND_GEN_ANT_SELECT_PIN_NUM;
 
         micropy_lpwan_ncs_pin_index = 1;

esp32/mptask.c

@@ -79,6 +79,7 @@
 
 
 #include "lteppp.h"
+#include "esp32chipinfo.h"
 /******************************************************************************
  DECLARE EXTERNAL FUNCTIONS
  ******************************************************************************/
@@ -127,11 +128,10 @@ void TASK_Micropython (void *pvParameters) {
     uint32_t gc_pool_size;
     bool soft_reset = false;
     bool wifi_on_boot;
-    esp_chip_info_t chip_info;
     uint32_t stack_len;
+    uint8_t chip_rev = esp32_get_chip_rev();
 
-    esp_chip_info(&chip_info);
-    if (chip_info.revision > 0) {
+    if (chip_rev > 0) {
         stack_len = (MICROPY_TASK_STACK_SIZE_PSRAM / sizeof(StackType_t));
     } else {
         stack_len = (MICROPY_TASK_STACK_SIZE / sizeof(StackType_t));
@@ -176,7 +176,7 @@ void TASK_Micropython (void *pvParameters) {
     // to recover from hiting the limit (the limit is measured in bytes)
     mp_stack_set_limit(stack_len - 1024);
 
-    if (esp_get_revision() > 0) {
+    if (esp32_get_chip_rev() > 0) {
         gc_pool_size = GC_POOL_SIZE_BYTES_PSRAM;
         gc_pool_upy = heap_caps_malloc(GC_POOL_SIZE_BYTES_PSRAM, MALLOC_CAP_SPIRAM);
     } else {

esp32/util/esp32chipinfo.c

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2019, Pycom Limited.
+ *
+ * This software is licensed under the GNU GPL version 3 or any
+ * later version, with permitted additional terms. For more information
+ * see the Pycom Licence v1.0 document supplied with this file, or
+ * available at https://www.pycom.io/opensource/licensing
+ */
+
+#include "esp_system.h"
+
+static esp_chip_info_t chip_info;
+
+void esp32_init_chip_info(void)
+{
+    // Get chip Info
+    esp_chip_info(&chip_info);
+}
+
+uint8_t esp32_get_chip_rev(void)
+{
+    return chip_info.revision;
+}
+
+

esp32/util/esp32chipinfo.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2019, Pycom Limited.
+ *
+ * This software is licensed under the GNU GPL version 3 or any
+ * later version, with permitted additional terms. For more information
+ * see the Pycom Licence v1.0 document supplied with this file, or
+ * available at https://www.pycom.io/opensource/licensing
+ */
+
+#ifndef ESP32_UTIL_ESP32CHIPINFO_H_
+#define ESP32_UTIL_ESP32CHIPINFO_H_
+
+extern void esp32_init_chip_info(void);
+extern uint8_t esp32_get_chip_rev(void);
+
+#endif /* ESP32_UTIL_ESP32CHIPINFO_H_ */