diff --git a/components/xtensa/CMakeLists.txt b/components/xtensa/CMakeLists.txt
index ce33679c2..5c335ffdd 100644
--- a/components/xtensa/CMakeLists.txt
+++ b/components/xtensa/CMakeLists.txt
@@ -6,9 +6,12 @@ else()
     set(srcs "debug_helpers.c"
              "debug_helpers_asm.S"
              "eri.c"
-             "stdatomic.c")
+             )
 
-    if(CONFIG_IDF_TARGET_ESP32)
+    if(IDF_TARGET STREQUAL "esp32s2beta")
+        list(APPEND srcs "stdatomic.c")
+    endif()
+    if(IDF_TARGET STREQUAL "esp32")
         list(APPEND srcs "trax.c")
     endif()
 endif()