From d0bb51aacc9070508c30db5b34f21655c99e2b6b Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Mon, 18 Jul 2022 08:27:12 +0200 Subject: [PATCH] cpu/esp*: move CPU_* definitions to CPU-specific Makefile.features --- cpu/esp32/Makefile.features | 7 +++++++ cpu/esp8266/Makefile.features | 2 ++ cpu/esp_common/Makefile.features | 2 -- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cpu/esp32/Makefile.features b/cpu/esp32/Makefile.features index a797b89662..f1542dad50 100644 --- a/cpu/esp32/Makefile.features +++ b/cpu/esp32/Makefile.features @@ -1,3 +1,10 @@ +ifneq (,$(filter esp32,$(CPU_FAM))) + CPU_ARCH = xtensa + CPU_CORE = xtensa-lx6 +else + $(error Unkwnown ESP32x SoC variant (family)) +endif + # MCU defined features that are provided independent on board definitions include $(RIOTCPU)/esp_common/Makefile.features diff --git a/cpu/esp8266/Makefile.features b/cpu/esp8266/Makefile.features index bf170a7a38..75114727e7 100644 --- a/cpu/esp8266/Makefile.features +++ b/cpu/esp8266/Makefile.features @@ -1,4 +1,6 @@ CPU_FAM = esp8266 +CPU_ARCH = xtensa +CPU_CORE = xtensa-l106 # MCU defined features that are provided independent on board definitions diff --git a/cpu/esp_common/Makefile.features b/cpu/esp_common/Makefile.features index d40e13e162..b05430e7a2 100644 --- a/cpu/esp_common/Makefile.features +++ b/cpu/esp_common/Makefile.features @@ -1,5 +1,3 @@ -CPU_ARCH = xtensa - # MCU defined features that are provided independent on board definitions FEATURES_PROVIDED += arch_32bit