RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #15834 from leandrolanzieri/pr/cpu/stm32/kconfig_features_conflict_fix

Browse Source 
cpu/stm32/kconfig: fix rtt/rtc error symbol
This commit is contained in:
Francisco 2021-01-25 10:15:32 +01:00 committed by GitHub
commit 947c63666e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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