Ver código fonte

Merge branch 'bugfix/twai_isr_iram' into 'master'

hal: fix CONFIG_TWAI_ISR_IN_IRAM for C3, hide TWAI menu for C2

See merge request espressif/esp-idf!16881
Ivan Grokhotkov 4 anos atrás
pai
commit
05b644ec50
2 arquivos alterados com 3 adições e 5 exclusões
  1. 1 0
      components/driver/Kconfig
  2. 2 5
      components/hal/linker.lf

+ 1 - 0
components/driver/Kconfig

@@ -86,6 +86,7 @@ menu "Driver configurations"
     endmenu # SPI Configuration
 
     menu "TWAI configuration"
+        depends on SOC_TWAI_SUPPORTED
 
         config TWAI_ISR_IN_IRAM
             bool "Place TWAI ISR function into IRAM"

+ 2 - 5
components/hal/linker.lf

@@ -14,11 +14,8 @@ entries:
     cpu_hal (noflash)
     soc_hal (noflash)
     wdt_hal_iram (noflash)
-    if IDF_TARGET_ESP32C3 = n && IDF_TARGET_ESP32H2 = n && IDF_TARGET_ESP32C2 = n:
-        if TWAI_ISR_IN_IRAM = y:
-            twai_hal_iram (noflash)
-        else:
-            twai_hal_iram (default)
+    if TWAI_ISR_IN_IRAM = y:
+        twai_hal_iram (noflash)
     if IDF_TARGET_ESP32 = n:
         spi_flash_hal_gpspi (noflash)
         systimer_hal (noflash)