kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 22:13:52 +01:00
Code Releases Activity

Merge pull request #14179 from aabadie/pr/cpu/stm32_cpu_fam

Browse Source 
cpu/stm32: fix remaining issues related to CPU_FAM variable
This commit is contained in:
Alexandre Abadie 2020-05-30 20:25:48 +02:00 committed by GitHub
commit e81a0761d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/stm32/Makefile.features
View File

@ -1,6 +1,6 @@
include $(RIOTCPU)/stm32/stm32_info.mk
FEATURES_PROVIDED += cpu_$(CPU_FAM)
FEATURES_PROVIDED += cpu_stm32$(CPU_FAM)
FEATURES_PROVIDED += periph_cpuid
FEATURES_PROVIDED += periph_gpio periph_gpio_irq
FEATURES_PROVIDED += puf_sram
@ -18,7 +18,7 @@ ifneq (,$(filter $(CPU_FAM),l0 l1))
FEATURES_PROVIDED += periph_eeprom
endif
ifeq (stm32f1,$(CPU_FAM))
ifeq (f1,$(CPU_FAM))
FEATURES_CONFLICT += periph_rtc:periph_rtt
FEATURES_CONFLICT_MSG += "On the STM32F1, the RTC and RTT map to the same hardware peripheral."
endif