From b5ea942d12d5094ac3e727e92ee7938538645279 Mon Sep 17 00:00:00 2001
From: Gunar Schorcht <gunar@schorcht.net>
Date: Mon, 18 Jul 2022 13:19:46 +0200
Subject: [PATCH 1/2] cpu/esp32: make esp_hw_counter feature dependent on
 ESP32x SoC family

Feature esp_hw_counter is not supported by all ESP32x SoC variants (families). Therefore it has to be defined dependent on defined CPU_FAM.
---
 cpu/esp32/Makefile.features | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cpu/esp32/Makefile.features b/cpu/esp32/Makefile.features
index 5b38766fa0..6daa02b12a 100644
--- a/cpu/esp32/Makefile.features
+++ b/cpu/esp32/Makefile.features
@@ -6,9 +6,12 @@ include $(RIOTCPU)/esp_common/Makefile.features
 
 FEATURES_PROVIDED += arch_esp32
 FEATURES_PROVIDED += esp_wifi_enterprise
-FEATURES_PROVIDED += esp_hw_counter
 FEATURES_PROVIDED += puf_sram
 
+ifeq (xtensa,$(CPU_ARCH))
+  FEATURES_PROVIDED += esp_hw_counter
+endif
+
 ifneq (,$(filter esp32-wrover%,$(CPU_MODEL)))
   FEATURES_PROVIDED += esp_spi_ram
 endif

From 6b3fe4aa70cbf583a514fcbdd6a5f9efe601811c Mon Sep 17 00:00:00 2001
From: Gunar Schorcht <gunar@schorcht.net>
Date: Mon, 18 Jul 2022 16:37:08 +0200
Subject: [PATCH 2/2] cpu/esp32: introduce CPU_ARCH_ESP32_XTENSA in Kconfig

---
 cpu/esp32/Kconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cpu/esp32/Kconfig b/cpu/esp32/Kconfig
index 9455c4ebaa..9a69f978ac 100644
--- a/cpu/esp32/Kconfig
+++ b/cpu/esp32/Kconfig
@@ -9,13 +9,17 @@ config CPU_CORE_XTENSA_LX6
     bool
     select CPU_ARCH_XTENSA
 
+config CPU_ARCH_ESP32_XTENSA
+    bool
+    select HAS_ESP_HW_COUNTER
+
 config CPU_FAM_ESP32
     bool
     select CPU_COMMON_ESP
     select CPU_CORE_XTENSA_LX6
+    select CPU_ARCH_ESP32_XTENSA
     select HAS_ARCH_ESP32
     select HAS_CPU_ESP32
-    select HAS_ESP_HW_COUNTER
     select HAS_ESP_WIFI_ENTERPRISE
     select HAS_PUF_SRAM