From 15c8f296f40372408a44b125be7f899b10ea19d1 Mon Sep 17 00:00:00 2001 From: jiangguangming Date: Wed, 2 Nov 2022 20:05:20 +0800 Subject: [PATCH] esp_rom: move esp_rom_spiflash_write_disable to esp32c6.rom.ld --- components/esp_rom/esp32c6/ld/esp32c6.rom.ld | 2 ++ components/esp_rom/esp32c6/ld/esp32c6.rom.spiflash.ld | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.ld index d43d88553c..88adb38f83 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.ld @@ -166,6 +166,8 @@ rom_spiflash_legacy_funcs = 0x4087fff0; rom_spiflash_legacy_data = 0x4087ffec; g_flash_guard_ops = 0x4087fff4; +/* Note: esp_rom_spiflash_write_disable was moved from esp32c6.rom.spiflash.ld */ +esp_rom_spiflash_write_disable = 0x40000278; /*************************************** Group hal_wdt diff --git a/components/esp_rom/esp32c6/ld/esp32c6.rom.spiflash.ld b/components/esp_rom/esp32c6/ld/esp32c6.rom.spiflash.ld index 3e35d56c60..55f28f0330 100644 --- a/components/esp_rom/esp32c6/ld/esp32c6.rom.spiflash.ld +++ b/components/esp_rom/esp32c6/ld/esp32c6.rom.spiflash.ld @@ -66,7 +66,7 @@ esp_flash_set_io_mode = 0x40000268; spi_flash_boot_attach = 0x4000026c; esp_flash_read_chip_id = 0x40000270; detect_spi_flash_chip = 0x40000274; -esp_rom_spiflash_write_disable = 0x40000278; +/* esp_rom_spiflash_write_disable = 0x40000278; */ esp_flash_suspend_cmd_init = 0x4000027c; /* Data (.data, .bss, .rodata) */ esp_flash_default_chip = 0x4087ffe8;