diff --git a/cpu/esp_common/Makefile b/cpu/esp_common/Makefile
index a22cd8e911..61924b40d1 100644
--- a/cpu/esp_common/Makefile
+++ b/cpu/esp_common/Makefile
@@ -17,4 +17,8 @@ ifneq (,$(filter esp_wifi,$(USEMODULE)))
   DIRS += esp-wifi
 endif
 
+ifneq (,$(filter esp_xtensa,$(USEMODULE)))
+  DIRS += esp-xtensa
+endif
+
 include $(RIOTBASE)/Makefile.base
diff --git a/cpu/esp_common/Makefile.dep b/cpu/esp_common/Makefile.dep
index 445124a84e..5df5e6b0b2 100644
--- a/cpu/esp_common/Makefile.dep
+++ b/cpu/esp_common/Makefile.dep
@@ -20,7 +20,8 @@ ifeq (,$(filter stdio_% slipdev_stdio,$(USEMODULE)))
   USEMODULE += stdio_uart
 endif
 
-ifneq (,$(filter esp8266 esp32 esp32s%,$(CPU)))
+ifeq (xtensa,$(CPU_ARCH))
+  USEMODULE += esp_xtensa
   USEMODULE += xtensa
 endif
 
diff --git a/cpu/esp_common/Makefile.features b/cpu/esp_common/Makefile.features
index 6374352c21..d40e13e162 100644
--- a/cpu/esp_common/Makefile.features
+++ b/cpu/esp_common/Makefile.features
@@ -24,6 +24,10 @@ FEATURES_PROVIDED += periph_timer
 FEATURES_PROVIDED += periph_uart_modecfg
 FEATURES_PROVIDED += ssp
 
+ifeq (xtensa,$(CPU_ARCH))
+  FEATURES_PROVIDED += arch_esp_xtensa
+endif
+
 FEATURES_CONFLICT += esp_wifi_ap:esp_now
 FEATURES_CONFLICT_MSG += "ESP_NOW and ESP_WIFI_AP can not be used at the same time."
 
diff --git a/cpu/esp_common/esp-xtensa/Makefile b/cpu/esp_common/esp-xtensa/Makefile
new file mode 100644
index 0000000000..392d129a03
--- /dev/null
+++ b/cpu/esp_common/esp-xtensa/Makefile
@@ -0,0 +1,3 @@
+MODULE=esp_xtensa
+
+include $(RIOTBASE)/Makefile.base