From 59a37806e729c6a2a0441bd30fc40b2157a84373 Mon Sep 17 00:00:00 2001 From: boarchuz <46267286+boarchuz@users.noreply.github.com> Date: Thu, 2 Sep 2021 05:12:49 +1000 Subject: [PATCH] fix bootloader build with rom flash driver Closes https://github.com/espressif/esp-idf/pull/7508 Closes https://github.com/espressif/esp-idf/issues/6849 --- components/esp_rom/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt index 69e2c0c727..0a3e2770fe 100644 --- a/components/esp_rom/CMakeLists.txt +++ b/components/esp_rom/CMakeLists.txt @@ -14,6 +14,12 @@ if(BOOTLOADER_BUILD) list(APPEND scripts "esp32s2beta/ld/esp32s2beta.rom.spiflash.ld") endif() + if(target STREQUAL "esp32") + if(NOT CONFIG_SPI_FLASH_ROM_DRIVER_PATCH) + list(APPEND scripts "esp32/ld/esp32.rom.spiflash.ld") + endif() + endif() + if(CONFIG_ESP32_REV_MIN_3) list(APPEND scripts "esp32/ld/esp32.rom.eco3.ld") endif()