Skip to content

Commit 11e6682

Browse files
committed
change(gpspi): control hal function placement in the driver component
1 parent 23ce1cc commit 11e6682

File tree

4 files changed

+8
-19
lines changed

4 files changed

+8
-19
lines changed

components/esp_driver_spi/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ menu "ESP-Driver:SPI Configurations"
2424
default y
2525
depends on !HEAP_PLACE_FUNCTION_INTO_FLASH
2626
select PERIPH_CTRL_FUNC_IN_IRAM
27-
select HAL_SPI_MASTER_FUNC_IN_IRAM
2827
select ESP_SPI_BUS_LOCK_ISR_FUNCS_IN_IRAM
2928
select GDMA_CTRL_FUNC_IN_IRAM if SOC_GDMA_SUPPORTED
3029
help
@@ -54,7 +53,6 @@ menu "ESP-Driver:SPI Configurations"
5453
bool "Place SPI slave ISR function into IRAM"
5554
default y
5655
select PERIPH_CTRL_FUNC_IN_IRAM
57-
select HAL_SPI_SLAVE_FUNC_IN_IRAM
5856
select GDMA_CTRL_FUNC_IN_IRAM if SOC_GDMA_SUPPORTED
5957
help
6058
Place the SPI slave ISR in to IRAM to avoid possible cache miss.

components/esp_driver_spi/linker.lf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,11 @@ entries:
88

99
if SOC_SPI_SUPPORT_SLAVE_HD_VER2 = y:
1010
spi_dma: spi_dma_get_eof_desc (noflash)
11+
12+
[mapping:gpspi_hal]
13+
archive: libhal.a
14+
entries:
15+
if SPI_MASTER_ISR_IN_IRAM = y:
16+
spi_hal_iram (noflash)
17+
if SPI_SLAVE_ISR_IN_IRAM = y:
18+
spi_slave_hal_iram (noflash)

components/hal/Kconfig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,6 @@ menu "Hardware Abstraction Layer (HAL) and Low Level (LL)"
9191
features will be added and bugs will be fixed in the IDF source
9292
but cannot be synced to ROM.
9393

94-
config HAL_SPI_MASTER_FUNC_IN_IRAM
95-
bool
96-
depends on SPI_MASTER_ISR_IN_IRAM
97-
help
98-
Enable this option to place SPI master hal layer functions into IRAM.
99-
100-
config HAL_SPI_SLAVE_FUNC_IN_IRAM
101-
bool
102-
depends on SPI_SLAVE_ISR_IN_IRAM
103-
help
104-
Enable this option to place SPI slave hal layer functions into IRAM.
105-
10694
config HAL_ECDSA_GEN_SIG_CM
10795
bool "Enable countermeasure for ECDSA signature generation"
10896
depends on IDF_TARGET_ESP32H2

components/hal/linker.lf

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ entries:
99
cache_hal_esp32 (noflash)
1010
else:
1111
cache_hal (noflash)
12-
if SOC_GPSPI_SUPPORTED = y:
13-
if HAL_SPI_MASTER_FUNC_IN_IRAM = y:
14-
spi_hal_iram (noflash)
15-
if HAL_SPI_SLAVE_FUNC_IN_IRAM = y:
16-
spi_slave_hal_iram (noflash)
1712
if SOC_I2C_SUPPORTED = y:
1813
i2c_hal_iram (noflash)
1914
if HAL_WDT_USE_ROM_IMPL = n:

0 commit comments

Comments
 (0)