riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/stm32/kconfig: fix rtt:rtc error symbol

Browse Source 
It only exists conflict between the usage of RTC and RTT on the F1
family, but the error symbol was being set for all of them. This fixes
the issue.
This commit is contained in:
Leandro Lanzieri 2021-01-22 08:45:20 +01:00
parent e1052f0152
commit e5aca465bd
No known key found for this signature in database
GPG Key ID: F4E9A721761C7593
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpu/stm32/Kconfig
View File

@ -30,10 +30,6 @@ config HAS_BOOTLOADER_STM32
help
Indicates that the stm32 bootloader is being used.
config ERROR_MODULES_CONFLICT
default "On STM32, the RTC and RTT map to the same hardware peripheral." if MODULE_PERIPH_RTC && MODULE_PERIPH_RTT
depends on CPU_STM32
orsource "kconfigs/Kconfig.clk"
orsource "kconfigs/*/Kconfig"
orsource "kconfigs/*/Kconfig.lines"

9
cpu/stm32/kconfigs/f1/Kconfig
View File

@ -17,8 +17,15 @@ config CPU_FAM_F1
select HAS_BOOTLOADER_STM32
select CLOCK_HAS_NO_MCO_PRE
if CPU_FAM_F1
config CPU_FAM
default "f1" if CPU_FAM_F1
default "f1"
config ERROR_MODULES_CONFLICT
default "On STM32F1, the RTC and RTT map to the same hardware peripheral." if MODULE_PERIPH_RTC && MODULE_PERIPH_RTT
endif # CPU_FAM_F1
config HAS_CPU_STM32F1
bool