Skip to content

fix(esp8266): Use custom flash config due to different ROM implementation #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Dzarda7 merged 1 commit into from
Mar 3, 2026
Merged

fix(esp8266): Use custom flash config due to different ROM implementation #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/target/common/src/flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ void __attribute__((weak)) stub_target_reset_default_spi_pins(void)
#endif
}

int stub_target_flash_update_config(uint32_t flash_id,
uint32_t flash_size,
uint32_t block_size,
uint32_t sector_size,
uint32_t page_size,
uint32_t status_mask)
int __attribute__((weak)) stub_target_flash_update_config(uint32_t flash_id,
uint32_t flash_size,
uint32_t block_size,
uint32_t sector_size,
uint32_t page_size,
uint32_t status_mask)
{
int res = esp_rom_spiflash_config_param(flash_id, flash_size, block_size, sector_size, page_size, status_mask);
if (res != ESP_ROM_SPIFLASH_RESULT_OK) {
Expand Down
30 changes: 28 additions & 2 deletions src/target/esp8266/src/flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@

#include <soc/spi_mem_compat.h>

extern esp_rom_spiflash_chip_t g_rom_flashchip;
// ESP8266 contains g_rom_flashchip, but it is in different order than esp_rom_spiflash_chip_t,
// esp_rom_spiflash_config_param might take also different order of parameters but due to missing
// possibility to check in ROM code custom implementation seems like okay solution preventing
// possible future issues.
static esp_rom_spiflash_chip_t g_rom_flashchip_custom = {
.block_size = STUB_FLASH_BLOCK_SIZE,
.sector_size = STUB_FLASH_SECTOR_SIZE,
.page_size = STUB_FLASH_PAGE_SIZE,
.status_mask = STUB_FLASH_STATUS_MASK,
};

extern int esp_rom_spiflash_write(uint32_t flash_addr, const void *data, uint32_t size);
extern void esp_rom_spiflash_attach(void);
extern void esp_rom_spiflash_select_padsfunc(void);
Expand All @@ -31,7 +41,23 @@ void stub_target_reset_default_spi_pins(void)

esp_rom_spiflash_chip_t *stub_target_flash_get_config(void)
{
return &g_rom_flashchip;
return &g_rom_flashchip_custom;
}

int stub_target_flash_update_config(uint32_t flash_id,
uint32_t flash_size,
uint32_t block_size,
uint32_t sector_size,
uint32_t page_size,
uint32_t status_mask)
{
g_rom_flashchip_custom.flash_id = flash_id;
g_rom_flashchip_custom.chip_size = flash_size;
g_rom_flashchip_custom.block_size = block_size;
g_rom_flashchip_custom.sector_size = sector_size;
g_rom_flashchip_custom.page_size = page_size;
g_rom_flashchip_custom.status_mask = status_mask;
return STUB_LIB_OK;
}

void stub_target_flash_attach(uint32_t ishspi, bool legacy)
Expand Down