fixup! cpu/efm32/efr32*: provide required librail information

RIOT-OS · Oct 15, 2022 · 9b45279 · 9b45279
1 parent 7248a21
commit 9b45279
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 15 deletions.
diff --git a/cpu/efm32/Makefile.dep b/cpu/efm32/Makefile.dep
@@ -13,7 +13,4 @@ endif
 # include CPU family module
 USEMODULE += cpu_$(CPU_FAM)
 
-# allow the CPU family to pull-in own specific dependencies
--include $(RIOTCPU)/efm32/families/$(CPU_FAM)/Makefile.dep
-
 include $(RIOTCPU)/cortexm_common/Makefile.dep
diff --git a/cpu/efm32/Makefile.features b/cpu/efm32/Makefile.features
@@ -3,6 +3,9 @@ include $(RIOTCPU)/efm32/efm32-features.mk
 
 CPU_CORE = $(EFM32_ARCHITECTURE)
 
+# allow CPU families to add features individually
+-include $(RIOTCPU)/efm32/families/$(CPU_FAM)/Makefile.features
+
 # families without MPU
 ifeq (,$(filter efm32zg efm32hg, $(CPU_FAM)))
   FEATURES_PROVIDED += cortexm_mpu
@@ -22,6 +25,9 @@ FEATURES_PROVIDED += periph_wdt
 FEATURES_CONFLICT += periph_rtc:periph_rtt
 FEATURES_CONFLICT_MSG += "On the EFM32, the RTC and RTT map to the same hardware peripheral."
 
+FEATURES_CONFLICT += cortexm_fpu:gecko_sdk_librail_nonfpu
+FEATURES_CONFLICT_MSG += "Using librail with the FPU enabled is not supported on this CPU."
+
 ifeq (1,$(EFM32_TRNG))
   FEATURES_PROVIDED += periph_hwrng
 endif

diff --git a/cpu/efm32/families/efr32mg12p/Kconfig b/cpu/efm32/families/efr32mg12p/Kconfig
@@ -11,6 +11,7 @@ config CPU_FAM_EFR32MG12P
     select CPU_EFM32_SERIES1
     select HAS_PERIPH_HWRNG
     select HAS_CORTEXM_MPU
+    select HAS_GECKO_SDK_LIBRAIL_NONFPU
 
 config MODULE_CPU_EFR32MG12P
     bool

diff --git a/cpu/efm32/families/efr32mg12p/Makefile.dep b/cpu/efm32/families/efr32mg12p/Makefile.dep
diff --git a/cpu/efm32/families/efr32mg12p/Makefile.features b/cpu/efm32/families/efr32mg12p/Makefile.features
@@ -0,0 +1 @@
+FEATURES_PROVIDED += gecko_sdk_librail_nonfpu
diff --git a/cpu/efm32/families/efr32mg1b/Kconfig b/cpu/efm32/families/efr32mg1b/Kconfig
@@ -10,6 +10,7 @@ config CPU_FAM_EFR32MG1B
     select CPU_COMMON_EFM32
     select CPU_EFM32_SERIES1
     select HAS_CORTEXM_MPU
+    select HAS_GECKO_SDK_LIBRAIL_NONFPU
 
 config MODULE_CPU_EFR32MG1B
     bool

diff --git a/cpu/efm32/families/efr32mg1b/Makefile.dep b/cpu/efm32/families/efr32mg1b/Makefile.dep
diff --git a/cpu/efm32/families/efr32mg1b/Makefile.features b/cpu/efm32/families/efr32mg1b/Makefile.features
@@ -0,0 +1 @@
+FEATURES_PROVIDED += gecko_sdk_librail_nonfpu
diff --git a/cpu/efm32/families/efr32mg1p/Kconfig b/cpu/efm32/families/efr32mg1p/Kconfig
@@ -10,6 +10,7 @@ config CPU_FAM_EFR32MG1P
     select CPU_COMMON_EFM32
     select CPU_EFM32_SERIES1
     select HAS_CORTEXM_MPU
+    select HAS_GECKO_SDK_LIBRAIL_NONFPU
 
 config MODULE_CPU_EFR32MG1P
     bool

diff --git a/cpu/efm32/families/efr32mg1p/Makefile.dep b/cpu/efm32/families/efr32mg1p/Makefile.dep
diff --git a/cpu/efm32/families/efr32mg1p/Makefile.features b/cpu/efm32/families/efr32mg1p/Makefile.features
@@ -0,0 +1 @@
+FEATURES_PROVIDED += gecko_sdk_librail_nonfpu