From af2ca65a02080d75de0f035be13c6218ca1d8d9e Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Wed, 28 Nov 2018 16:47:25 +0800 Subject: [PATCH] feat(bootloader_support): Modify chip size to be spi flash configuration value --- components/bootloader_support/src/flash_partitions.c | 3 ++- components/esp8266/include/esp8266/rom_functions.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/bootloader_support/src/flash_partitions.c b/components/bootloader_support/src/flash_partitions.c index f258ca64..002320ff 100644 --- a/components/bootloader_support/src/flash_partitions.c +++ b/components/bootloader_support/src/flash_partitions.c @@ -101,6 +101,7 @@ esp_err_t esp_partition_table_basic_verify(const esp_partition_info_t *partition #include "esp_err.h" #include "esp_flash_partitions.h" #include "esp_log.h" +#include "esp8266/rom_functions.h" static const char *TAG = "flash_parts"; @@ -108,7 +109,7 @@ esp_err_t esp_partition_table_basic_verify(const esp_partition_info_t *partition { int md5_found = 0; int num_parts; - uint32_t chip_size = 2 * 1024 * 1024;// = g_rom_flashchip.chip_size; + uint32_t chip_size = flashchip.chip_size; *num_partitions = 0; for (num_parts = 0; num_parts < ESP_PARTITION_TABLE_MAX_ENTRIES; num_parts++) { diff --git a/components/esp8266/include/esp8266/rom_functions.h b/components/esp8266/include/esp8266/rom_functions.h index 6aeacb2b..2eec9874 100644 --- a/components/esp8266/include/esp8266/rom_functions.h +++ b/components/esp8266/include/esp8266/rom_functions.h @@ -13,6 +13,8 @@ typedef struct esp_spi_flash_chip { uint32_t status_mask; } esp_spi_flash_chip_t; +extern esp_spi_flash_chip_t flashchip; + uint32_t Wait_SPI_Idle(); void uart_div_modify(uint32_t uart_no, uint32_t baud_div);