From e5aca465bd4fa352ec0d08fc8d61c682d36a9416 Mon Sep 17 00:00:00 2001 From: Leandro Lanzieri Date: Fri, 22 Jan 2021 08:45:20 +0100 Subject: [PATCH] cpu/stm32/kconfig: fix rtt:rtc error symbol 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. --- cpu/stm32/Kconfig | 4 ---- cpu/stm32/kconfigs/f1/Kconfig | 9 ++++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cpu/stm32/Kconfig b/cpu/stm32/Kconfig index 114529daae..653249abe9 100644 --- a/cpu/stm32/Kconfig +++ b/cpu/stm32/Kconfig @@ -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" diff --git a/cpu/stm32/kconfigs/f1/Kconfig b/cpu/stm32/kconfigs/f1/Kconfig index dbd41b2bf0..01e9848dbb 100644 --- a/cpu/stm32/kconfigs/f1/Kconfig +++ b/cpu/stm32/kconfigs/f1/Kconfig @@ -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