From ce0ef8939cbaf3598ff68e975f0cc1eb77482e23 Mon Sep 17 00:00:00 2001 From: Gilles DOFFE Date: Thu, 5 Nov 2020 01:06:10 +0100 Subject: [PATCH] cpu/stm32: disable periph_wdt for mp1 family In STM32MP1 family, independant watchdogs (IWDG1 and IWDG2) are dedicated to the MPU (Cortex-A7). Thus simply disable the feature for STM32MP1 family. Signed-off-by: Gilles DOFFE --- cpu/stm32/Kconfig | 1 - cpu/stm32/Makefile.features | 2 +- cpu/stm32/kconfigs/f0/Kconfig | 1 + cpu/stm32/kconfigs/f1/Kconfig | 1 + cpu/stm32/kconfigs/f2/Kconfig | 1 + cpu/stm32/kconfigs/f3/Kconfig | 1 + cpu/stm32/kconfigs/f4/Kconfig | 1 + cpu/stm32/kconfigs/f7/Kconfig | 1 + cpu/stm32/kconfigs/g0/Kconfig | 1 + cpu/stm32/kconfigs/g4/Kconfig | 1 + cpu/stm32/kconfigs/l0/Kconfig | 1 + cpu/stm32/kconfigs/l1/Kconfig | 1 + cpu/stm32/kconfigs/l4/Kconfig | 1 + cpu/stm32/kconfigs/l5/Kconfig | 1 + cpu/stm32/kconfigs/wb/Kconfig | 1 + 15 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cpu/stm32/Kconfig b/cpu/stm32/Kconfig index 9dd9c5ced1..114529daae 100644 --- a/cpu/stm32/Kconfig +++ b/cpu/stm32/Kconfig @@ -14,7 +14,6 @@ config CPU_STM32 select HAS_PERIPH_TIMER_PERIODIC select HAS_PERIPH_UART_MODECFG select HAS_PERIPH_UART_NONBLOCKING - select HAS_PERIPH_WDT # Common CPU symbol config CPU diff --git a/cpu/stm32/Makefile.features b/cpu/stm32/Makefile.features index 7fdf1ec4cf..6e3c46ad99 100644 --- a/cpu/stm32/Makefile.features +++ b/cpu/stm32/Makefile.features @@ -2,6 +2,7 @@ include $(RIOTCPU)/stm32/stm32_info.mk ifneq (mp1,$(CPU_FAM)) FEATURES_PROVIDED += bootloader_stm32 + FEATURES_PROVIDED += periph_wdt endif FEATURES_PROVIDED += cpu_stm32$(CPU_FAM) FEATURES_PROVIDED += periph_cpuid @@ -9,7 +10,6 @@ FEATURES_PROVIDED += periph_gpio periph_gpio_irq FEATURES_PROVIDED += periph_timer_periodic FEATURES_PROVIDED += periph_uart_modecfg FEATURES_PROVIDED += periph_uart_nonblocking -FEATURES_PROVIDED += periph_wdt ifneq (,$(filter $(CPU_FAM),f0 f1 f3 g0 g4 l0 l1 l4 l5 wb)) FEATURES_PROVIDED += periph_flashpage diff --git a/cpu/stm32/kconfigs/f0/Kconfig b/cpu/stm32/kconfigs/f0/Kconfig index f3352da00a..d0c1d49834 100644 --- a/cpu/stm32/kconfigs/f0/Kconfig +++ b/cpu/stm32/kconfigs/f0/Kconfig @@ -16,6 +16,7 @@ config CPU_FAM_F0 select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_FLASHPAGE_RAW + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config HAS_CPU_STM32F0 diff --git a/cpu/stm32/kconfigs/f1/Kconfig b/cpu/stm32/kconfigs/f1/Kconfig index 17f3a84512..3cd94fefc2 100644 --- a/cpu/stm32/kconfigs/f1/Kconfig +++ b/cpu/stm32/kconfigs/f1/Kconfig @@ -13,6 +13,7 @@ config CPU_FAM_F1 select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_FLASHPAGE_RAW + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/f2/Kconfig b/cpu/stm32/kconfigs/f2/Kconfig index a682bb6c95..f99960816f 100644 --- a/cpu/stm32/kconfigs/f2/Kconfig +++ b/cpu/stm32/kconfigs/f2/Kconfig @@ -12,6 +12,7 @@ config CPU_FAM_F2 select HAS_CPU_STM32F2 select HAS_CORTEXM_MPU select HAS_PERIPH_HWRNG + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/f3/Kconfig b/cpu/stm32/kconfigs/f3/Kconfig index 566104144d..5ee691fd6a 100644 --- a/cpu/stm32/kconfigs/f3/Kconfig +++ b/cpu/stm32/kconfigs/f3/Kconfig @@ -13,6 +13,7 @@ config CPU_FAM_F3 select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_FLASHPAGE_RAW + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/f4/Kconfig b/cpu/stm32/kconfigs/f4/Kconfig index 57e5a27e68..2dcabf9cf8 100644 --- a/cpu/stm32/kconfigs/f4/Kconfig +++ b/cpu/stm32/kconfigs/f4/Kconfig @@ -11,6 +11,7 @@ config CPU_FAM_F4 select CPU_CORE_CORTEX_M4F select HAS_CPU_STM32F4 select HAS_CORTEXM_MPU + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/f7/Kconfig b/cpu/stm32/kconfigs/f7/Kconfig index 4c547910d8..9a1d4c8094 100644 --- a/cpu/stm32/kconfigs/f7/Kconfig +++ b/cpu/stm32/kconfigs/f7/Kconfig @@ -12,6 +12,7 @@ config CPU_FAM_F7 select HAS_CPU_STM32F7 select HAS_CORTEXM_MPU select HAS_PERIPH_HWRNG + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/g0/Kconfig b/cpu/stm32/kconfigs/g0/Kconfig index ab866a67d5..b1157ce533 100644 --- a/cpu/stm32/kconfigs/g0/Kconfig +++ b/cpu/stm32/kconfigs/g0/Kconfig @@ -13,6 +13,7 @@ config CPU_FAM_G0 select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_FLASHPAGE_RAW + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/g4/Kconfig b/cpu/stm32/kconfigs/g4/Kconfig index 22aae73495..f80a6f9746 100644 --- a/cpu/stm32/kconfigs/g4/Kconfig +++ b/cpu/stm32/kconfigs/g4/Kconfig @@ -14,6 +14,7 @@ config CPU_FAM_G4 select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_HWRNG + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/l0/Kconfig b/cpu/stm32/kconfigs/l0/Kconfig index 0e3ba3f284..66fd11e584 100644 --- a/cpu/stm32/kconfigs/l0/Kconfig +++ b/cpu/stm32/kconfigs/l0/Kconfig @@ -13,6 +13,7 @@ config CPU_FAM_L0 select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_EEPROM + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/l1/Kconfig b/cpu/stm32/kconfigs/l1/Kconfig index 721638812c..15c0fc93c1 100644 --- a/cpu/stm32/kconfigs/l1/Kconfig +++ b/cpu/stm32/kconfigs/l1/Kconfig @@ -14,6 +14,7 @@ config CPU_FAM_L1 select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_EEPROM + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/l4/Kconfig b/cpu/stm32/kconfigs/l4/Kconfig index 0047c01f3b..312d8ab210 100644 --- a/cpu/stm32/kconfigs/l4/Kconfig +++ b/cpu/stm32/kconfigs/l4/Kconfig @@ -14,6 +14,7 @@ config CPU_FAM_L4 select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_HWRNG + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/l5/Kconfig b/cpu/stm32/kconfigs/l5/Kconfig index 0ef12c26c1..ddb6169bb4 100644 --- a/cpu/stm32/kconfigs/l5/Kconfig +++ b/cpu/stm32/kconfigs/l5/Kconfig @@ -13,6 +13,7 @@ config CPU_FAM_L5 select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_HWRNG + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM diff --git a/cpu/stm32/kconfigs/wb/Kconfig b/cpu/stm32/kconfigs/wb/Kconfig index 1c955d6b55..679e301dad 100644 --- a/cpu/stm32/kconfigs/wb/Kconfig +++ b/cpu/stm32/kconfigs/wb/Kconfig @@ -13,6 +13,7 @@ config CPU_FAM_WB select HAS_PERIPH_FLASHPAGE select HAS_PERIPH_FLASHPAGE_PAGEWISE select HAS_PERIPH_HWRNG + select HAS_PERIPH_WDT select HAS_BOOTLOADER_STM32 config CPU_FAM