build and link hello-world for esp32s2beta

components/freertos/include/freertos/FreeRTOSConfig.h

@@ -76,7 +76,7 @@
 /* ESP31 and ESP32 are dualcore processors. */
 #ifndef CONFIG_FREERTOS_UNICORE
 #define portNUM_PROCESSORS 2
-#else 
+#else
 #define portNUM_PROCESSORS 1
 #endif
 
@@ -117,7 +117,11 @@ int xt_clock_freq(void) __attribute__((deprecated));
 /* configASSERT behaviour */
 #ifndef __ASSEMBLER__
 #include <stdlib.h> /* for abort() */
+#if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32S2BETA
+#include "esp32s2beta/rom/ets_sys.h"
+#endif
 
 #if defined(CONFIG_FREERTOS_ASSERT_DISABLE)
 #define configASSERT(a) /* assertions disabled */
@@ -155,7 +159,7 @@ int xt_clock_freq(void) __attribute__((deprecated));
  * memory.
  *
  * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
  *----------------------------------------------------------*/
 
 #define configUSE_PREEMPTION			1

components/freertos/include/freertos/portmacro.h

@@ -349,12 +349,14 @@ static inline unsigned portENTER_CRITICAL_NESTED() {
  * ESP32 (portMUX assertions would fail).
  */
 static inline void uxPortCompareSet(volatile uint32_t *addr, uint32_t compare, uint32_t *set) {
+#ifndef CONFIG_FREERTOS_UNICORE
     __asm__ __volatile__ (
         "WSR 	    %2,SCOMPARE1 \n"
         "S32C1I     %0, %1, 0	 \n"
         :"=r"(*set)
         :"r"(addr), "r"(compare), "0"(*set)
         );
+#endif
 }
 
 

components/freertos/port.c

@@ -97,7 +97,6 @@
 
 #include "xtensa_rtos.h"
 
-#include "esp32/rom/ets_sys.h"
 #include "soc/cpu.h"
 
 #include "FreeRTOS.h"
@@ -109,6 +108,12 @@
 
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
+#include "sdkconfig.h"
+#if CONFIG_IDF_TARGET_ESP32
+#include "esp32/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32S2BETA
+#include "esp32s2beta/rom/ets_sys.h"
+#endif
 
 /* Defined in portasm.h */
 extern void _frxt_tick_timer_init(void);

components/freertos/queue.c

@@ -78,8 +78,12 @@
 
 #include <stdlib.h>
 #include <string.h>
-
+#include "sdkconfig.h"
+#if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32S2BETA
+#include "esp32s2beta/rom/ets_sys.h"
+#endif
 
 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
 all the API functions to use the MPU wrappers.  That should only be done when

components/freertos/tasks.c

@@ -70,13 +70,17 @@
 /* Standard includes. */
 #include <stdlib.h>
 #include <string.h>
+#include "sdkconfig.h"
 
 /* Defining MPU_WRAPPERS_INCLUDED_FROM_API_FILE prevents task.h from redefining
 all the API functions to use the MPU wrappers.  That should only be done when
 task.h is included from an application file. */
 #define MPU_WRAPPERS_INCLUDED_FROM_API_FILE
-
+#if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32S2BETA
+#include "esp32s2beta/rom/ets_sys.h"
+#endif
 #include "esp_newlib.h"
 #include "esp_debug_helpers.h"
 

components/freertos/xtensa_init.c

@@ -30,11 +30,16 @@ that are implemented in C.
 
 
 #ifdef XT_BOARD
-#include    <xtensa/xtbsp.h>
+#include "xtensa/xtbsp.h"
 #endif
 
-#include    "xtensa_rtos.h"
-#include    "esp32/clk.h"
+#include "xtensa_rtos.h"
+#include "sdkconfig.h"
+#if CONFIG_IDF_TARGET_ESP32
+#include "esp32/clk.h"
+#elif CONFIG_IDF_TARGET_ESP32S2BETA
+#include "esp32s2beta/clk.h"
+#endif
 
 #ifdef XT_RTOS_TIMER_INT
 

components/freertos/xtensa_intr.c

@@ -33,8 +33,12 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "freertos/FreeRTOS.h"
 #include "freertos/xtensa_api.h"
 #include "freertos/portable.h"
-
+#include "sdkconfig.h"
+#if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/ets_sys.h"
+#elif CONFIG_IDF_TARGET_ESP32S2BETA
+#include "esp32s2beta/rom/ets_sys.h"
+#endif
 
 #if XCHAL_HAVE_EXCEPTIONS