system/sleep: further fix spi flash/ram current leakage

components/bootloader_support/include/bootloader_common.h

@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-/// Type of hold a GPIO in low state
+// Type of hold a GPIO in low state
 typedef enum {
     GPIO_LONG_HOLD  = 1,    /*!< The long hold GPIO */
     GPIO_SHORT_HOLD = -1,   /*!< The short hold GPIO */
@@ -106,15 +106,6 @@ bool bootloader_common_label_search(const char *list, char *label);
  */
 void bootloader_configure_spi_pins(int drv);
 
-/**
- * @brief Get flash CS IO
- *
- * Can be determined by eFuse values, or the default value
- *
- * @return Flash CS IO
- */
-uint8_t bootloader_flash_get_cs_io(void);
-
 /**
  * @brief Calculates a sha-256 for a given partition or returns a appended digest.
  *

components/bootloader_support/src/bootloader_common.c

@@ -13,7 +13,6 @@
 #include "esp_rom_crc.h"
 #include "esp_rom_gpio.h"
 #include "esp_rom_sys.h"
-#include "esp_rom_efuse.h"
 #include "esp_flash_partitions.h"
 #include "bootloader_flash_priv.h"
 #include "bootloader_common.h"
@@ -21,7 +20,6 @@
 #include "soc/gpio_periph.h"
 #include "soc/rtc.h"
 #include "soc/efuse_reg.h"
-#include "soc/soc_caps.h"
 #include "hal/gpio_ll.h"
 #include "esp_image_format.h"
 #include "bootloader_sha.h"
@@ -188,19 +186,3 @@ void bootloader_common_vddsdio_configure(void)
     }
 #endif // CONFIG_BOOTLOADER_VDDSDIO_BOOST
 }
-
-uint8_t bootloader_flash_get_cs_io(void)
-{
-#if SOC_SPI_MEM_SUPPORT_CONFIG_GPIO_BY_EFUSE
-    uint8_t cs_io;
-    const uint32_t spiconfig = esp_rom_efuse_get_flash_gpio_info();
-    if (spiconfig == ESP_ROM_EFUSE_FLASH_DEFAULT_SPI) {
-        cs_io = SPI_CS0_GPIO_NUM;
-    } else {
-        cs_io = (spiconfig >> 18) & 0x3f;
-    }
-    return cs_io;
-#else
-    return SPI_CS0_GPIO_NUM;
-#endif
-}