Merge branch 'fix/build_when_rom_patch_disable' into 'master'

fix(spi_flash): Fix build fail when rom_patch config disabled

Closes IDFGH-14455

See merge request espressif/esp-idf!36521

Author: mythbuster5

components/esp_rom/patches/esp_rom_spiflash.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -24,8 +24,6 @@
 
 #define SPI_IDX   1
 
-#if CONFIG_SPI_FLASH_ROM_DRIVER_PATCH
-
 #if CONFIG_IDF_TARGET_ESP32
 
 extern esp_rom_spiflash_chip_t g_rom_spiflash_chip;
@@ -111,6 +109,12 @@ __attribute__((__unused__)) esp_rom_spiflash_result_t esp_rom_spiflash_clear_bp(
 }
 esp_rom_spiflash_result_t esp_rom_spiflash_unlock(void) __attribute__((alias("esp_rom_spiflash_clear_bp")));
 
+#endif // CONFIG_IDF_TARGET_ESP32
+
+#if CONFIG_SPI_FLASH_ROM_DRIVER_PATCH
+
+#if CONFIG_IDF_TARGET_ESP32
+
 static esp_rom_spiflash_result_t esp_rom_spiflash_enable_write(esp_rom_spiflash_chip_t *spi);
 
 //only support spi1

components/spi_flash/test_apps/esp_flash/sdkconfig.ci.rom_patch

@@ -0,0 +1 @@
+CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=n