Xtensa_ESP32: Fix build issues when external SPIRAM is enabled

shubhamkulkarni97 · shubhamkulkarni97 · commit 04f62f3c8de3 · 2021-08-12T10:59:51.000+05:30
diff --git a/portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h b/portable/ThirdParty/GCC/Xtensa_ESP32/include/portmacro.h
@@ -89,6 +89,9 @@
 
     #include <esp_heap_caps.h>
     #include "soc/soc_memory_layout.h"
+#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0))
+    #include "soc/compare_set.h"
+#endif /* ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0) */
 
 /*#include "xtensa_context.h" */
 
diff --git a/portable/ThirdParty/GCC/Xtensa_ESP32/port.c b/portable/ThirdParty/GCC/Xtensa_ESP32/port.c
@@ -484,6 +484,8 @@ void vPortSetStackWatchpoint( void * pxStackStart )
     esp_set_watchpoint( 1, ( char * ) addr, 32, ESP_WATCHPOINT_STORE );
 }
 
+#if (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0))
+
 #if defined( CONFIG_SPIRAM_SUPPORT )
 
 /*
@@ -522,6 +524,7 @@ void vPortSetStackWatchpoint( void * pxStackStart )
     }
 #endif //defined(CONFIG_SPIRAM_SUPPORT)
 
+#endif /* ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0) */
 
 
 uint32_t xPortGetTickRateHz( void )

Original file line number	Diff line number	Diff line change
`@@ -484,6 +484,8 @@ void vPortSetStackWatchpoint( void * pxStackStart )`
`484`	`484`	`esp_set_watchpoint( 1, ( char * ) addr, 32, ESP_WATCHPOINT_STORE );`
`485`	`485`	`}`
`486`	`486`
	`487`	`+#if (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0))`
	`488`	`+`
`487`	`489`	`#if defined( CONFIG_SPIRAM_SUPPORT )`
`488`	`490`
`489`	`491`	`/*`
`@@ -522,6 +524,7 @@ void vPortSetStackWatchpoint( void * pxStackStart )`
`522`	`524`	`}`
`523`	`525`	`#endif //defined(CONFIG_SPIRAM_SUPPORT)`
`524`	`526`
	`527`	`+#endif /* ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 2, 0) */`
`525`	`528`
`526`	`529`
`527`	`530`	`uint32_t xPortGetTickRateHz( void )`