From acb835d86fd21c80d494d1ea49136b5632a6c354 Mon Sep 17 00:00:00 2001 From: baohongde Date: Wed, 24 Jun 2020 12:05:12 +0800 Subject: [PATCH] components/sys: Fix build error about livelock when intwdt is disable --- components/esp_system/port/esp32/dport_panic_highint_hdl.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_system/port/esp32/dport_panic_highint_hdl.S b/components/esp_system/port/esp32/dport_panic_highint_hdl.S index 3979dd40cb..e554a42d43 100644 --- a/components/esp_system/port/esp32/dport_panic_highint_hdl.S +++ b/components/esp_system/port/esp32/dport_panic_highint_hdl.S @@ -41,7 +41,7 @@ Interrupt , a high-priority interrupt, is used for several things: _l4_intr_stack: .space L4_INTR_STACK_SIZE*portNUM_PROCESSORS /* This allocates stacks for each individual CPU. */ -#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX +#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX && CONFIG_ESP_INT_WDT .global _l4_intr_livelock_counter .global _l4_intr_livelock_max .align 16 @@ -70,7 +70,7 @@ xt_highint4: bnez a0, .handle_dport_access_int #endif // CONFIG_FREERTOS_UNICORE -#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX +#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX && CONFIG_ESP_INT_WDT /* See if we're here for the tg1 watchdog interrupt */ rsr a0, INTERRUPT extui a0, a0, ETS_T1_WDT_INUM, 1 @@ -163,7 +163,7 @@ xt_highint4: rfi 4 -#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX +#if CONFIG_ESP32_ECO3_CACHE_LOCK_FIX && CONFIG_ESP_INT_WDT /* --------------------------------------------------------------------------------