From cd5a847684e3990d878dc8e05bdc8f20a09a73be Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Mon, 24 Aug 2020 15:02:33 +0200 Subject: [PATCH] cpu/sam0_common: define CPU_FAM based on CPU_MODEL --- cpu/sam0_common/Makefile.features | 2 ++ cpu/samd21/Makefile.features | 1 - cpu/samd5x/Makefile.features | 1 - cpu/saml1x/Makefile.features | 8 -------- cpu/saml21/Makefile.features | 1 - 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/cpu/sam0_common/Makefile.features b/cpu/sam0_common/Makefile.features index 1ce1c11662..7c7df67cfb 100644 --- a/cpu/sam0_common/Makefile.features +++ b/cpu/sam0_common/Makefile.features @@ -1,3 +1,5 @@ +CPU_FAM := $(shell echo $(CPU_MODEL) | cut -c -6) + FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_dma FEATURES_PROVIDED += periph_flashpage diff --git a/cpu/samd21/Makefile.features b/cpu/samd21/Makefile.features index 0f283eb987..ec15278a12 100644 --- a/cpu/samd21/Makefile.features +++ b/cpu/samd21/Makefile.features @@ -1,5 +1,4 @@ CPU_CORE = cortex-m0plus -CPU_FAM = samd21 FEATURES_PROVIDED += puf_sram diff --git a/cpu/samd5x/Makefile.features b/cpu/samd5x/Makefile.features index d2bcf5a8d9..5ef1caaa40 100644 --- a/cpu/samd5x/Makefile.features +++ b/cpu/samd5x/Makefile.features @@ -1,5 +1,4 @@ CPU_CORE = cortex-m4f -CPU_FAM = samd5x FEATURES_PROVIDED += periph_hwrng FEATURES_PROVIDED += backup_ram diff --git a/cpu/saml1x/Makefile.features b/cpu/saml1x/Makefile.features index 70afaf4b9b..9702eab806 100644 --- a/cpu/saml1x/Makefile.features +++ b/cpu/saml1x/Makefile.features @@ -1,13 +1,5 @@ CPU_CORE = cortex-m23 -ifneq (,$(filter saml10%,$(CPU_MODEL))) - CPU_FAM = saml10 -else ifneq (,$(filter saml11%,$(CPU_MODEL))) - CPU_FAM = saml11 -else - $(error Unknown saml1x CPU Model: $(CPU_MODEL)) -endif - # TODO: The cortex-m23 MPU is not ported # FEATURES_PROVIDED += cortexm_mpu diff --git a/cpu/saml21/Makefile.features b/cpu/saml21/Makefile.features index 3e4b0d6fa8..2bb3defaa4 100644 --- a/cpu/saml21/Makefile.features +++ b/cpu/saml21/Makefile.features @@ -1,5 +1,4 @@ CPU_CORE = cortex-m0plus -CPU_FAM = saml21 # The SAMR30 line of MCUs does not contain a TRNG CPU_MODELS_WITHOUT_HWRNG += samr30%