diff --git a/examples/peripherals/spi_master/hd_eeprom/components/eeprom/linker.lf b/examples/peripherals/spi_master/hd_eeprom/components/eeprom/linker.lf
index e9b6befe51..4c11ffc8de 100644
--- a/examples/peripherals/spi_master/hd_eeprom/components/eeprom/linker.lf
+++ b/examples/peripherals/spi_master/hd_eeprom/components/eeprom/linker.lf
@@ -7,18 +7,10 @@ archive: libeeprom.a
 entries:
     if EXAMPLE_USE_SPI1_PINS = y:
         * (noflash)
-
-[mapping:ext_driver]
-archive: libesp_driver_gpio.a
-entries:
-    if EXAMPLE_USE_SPI1_PINS = y:
-        gpio: gpio_intr_enable (noflash)
-
-[mapping:ext_soc]
-archive: libhal.a
-entries:
-    if EXAMPLE_USE_SPI1_PINS = y:
-        gpio_hal: gpio_hal_intr_enable_on_core (noflash)
+        # Following code are not used during SPI1 bus or bus option
+        spi_eeprom: eeprom_wait_done_by_intr (default)
+        spi_eeprom: spi_eeprom_deinit (default)
+        spi_eeprom: spi_eeprom_init (default)
 
 [mapping:ext_newlib]
 archive: libnewlib.a
diff --git a/examples/peripherals/spi_master/hd_eeprom/components/eeprom/spi_eeprom.c b/examples/peripherals/spi_master/hd_eeprom/components/eeprom/spi_eeprom.c
index 4e57ba6e64..06ee1f2e9b 100644
--- a/examples/peripherals/spi_master/hd_eeprom/components/eeprom/spi_eeprom.c
+++ b/examples/peripherals/spi_master/hd_eeprom/components/eeprom/spi_eeprom.c
@@ -60,41 +60,53 @@ static esp_err_t eeprom_simple_cmd(eeprom_context_t *ctx, uint16_t cmd)
     return spi_device_polling_transmit(ctx->spi, &t);
 }
 
+static esp_err_t eeprom_wait_done_by_intr(eeprom_context_t* ctx)
+{
+    xSemaphoreTake(ctx->ready_sem, 0);
+    gpio_set_level(ctx->cfg.cs_io, 1);
+    gpio_intr_enable(ctx->cfg.miso_io);
+
+    //Max processing time is 5ms, tick=1 may happen very soon, set to 2 at least
+    uint32_t tick_to_wait = MAX(EEPROM_BUSY_TIMEOUT_MS / portTICK_PERIOD_MS, 2);
+    BaseType_t ret = xSemaphoreTake(ctx->ready_sem, tick_to_wait);
+    gpio_intr_disable(ctx->cfg.miso_io);
+    gpio_set_level(ctx->cfg.cs_io, 0);
+
+    if (ret != pdTRUE) {
+        return ESP_ERR_TIMEOUT;
+    }
+    return ESP_OK;
+}
+
+static esp_err_t eeprom_wait_done_by_polling(eeprom_context_t* ctx)
+{
+    bool timeout = true;
+    gpio_set_level(ctx->cfg.cs_io, 1);
+    for (int i = 0; i < EEPROM_BUSY_TIMEOUT_MS * 1000; i ++) {
+        if (gpio_get_level(ctx->cfg.miso_io)) {
+            timeout = false;
+            break;
+        }
+        usleep(1);
+    }
+    gpio_set_level(ctx->cfg.cs_io, 0);
+    if (timeout) {
+        return ESP_ERR_TIMEOUT;
+    }
+    return ESP_OK;
+}
+
 static esp_err_t eeprom_wait_done(eeprom_context_t* ctx)
 {
     //have to keep cs low for 250ns
     usleep(1);
-    //clear signal
+    esp_err_t ret = ESP_FAIL;
     if (ctx->cfg.intr_used) {
-        xSemaphoreTake(ctx->ready_sem, 0);
-        gpio_set_level(ctx->cfg.cs_io, 1);
-        gpio_intr_enable(ctx->cfg.miso_io);
-
-        //Max processing time is 5ms, tick=1 may happen very soon, set to 2 at least
-        uint32_t tick_to_wait = MAX(EEPROM_BUSY_TIMEOUT_MS / portTICK_PERIOD_MS, 2);
-        BaseType_t ret = xSemaphoreTake(ctx->ready_sem, tick_to_wait);
-        gpio_intr_disable(ctx->cfg.miso_io);
-        gpio_set_level(ctx->cfg.cs_io, 0);
-
-        if (ret != pdTRUE) {
-            return ESP_ERR_TIMEOUT;
-        }
+        ret = eeprom_wait_done_by_intr(ctx);
     } else {
-        bool timeout = true;
-        gpio_set_level(ctx->cfg.cs_io, 1);
-        for (int i = 0; i < EEPROM_BUSY_TIMEOUT_MS * 1000; i ++) {
-            if (gpio_get_level(ctx->cfg.miso_io)) {
-                timeout = false;
-                break;
-            }
-            usleep(1);
-        }
-        gpio_set_level(ctx->cfg.cs_io, 0);
-        if (timeout) {
-            return ESP_ERR_TIMEOUT;
-        }
+        ret = eeprom_wait_done_by_polling(ctx);
     }
-    return ESP_OK;
+    return ret;
 }
 
 static void cs_high(spi_transaction_t* t)