From 8b16dbe308dbd6908a731ff431b766270bb7c4c3 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Tue, 15 Aug 2023 11:15:13 +0200 Subject: [PATCH] drivers: can: stm32h7: fdcan: fold Kconfig file into stm32 Kconfig file Fold the Kconfig options for the STM32H7 FDCAN driver into the main Kconfig.stm32 file. Signed-off-by: Henrik Brix Andersen --- drivers/can/Kconfig | 1 - drivers/can/Kconfig.stm32 | 8 ++++++++ drivers/can/Kconfig.stm32h7 | 11 ----------- 3 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 drivers/can/Kconfig.stm32h7 diff --git a/drivers/can/Kconfig b/drivers/can/Kconfig index 90a626b9f2a..ab8dcf94fe2 100644 --- a/drivers/can/Kconfig +++ b/drivers/can/Kconfig @@ -88,7 +88,6 @@ config CAN_QEMU_IFACE_NAME source "drivers/can/Kconfig.sam" source "drivers/can/Kconfig.sam0" source "drivers/can/Kconfig.stm32" -source "drivers/can/Kconfig.stm32h7" source "drivers/can/Kconfig.mcux" source "drivers/can/Kconfig.mcp2515" source "drivers/can/Kconfig.mcan" diff --git a/drivers/can/Kconfig.stm32 b/drivers/can/Kconfig.stm32 index 71bb9fcd50f..55fd232133a 100644 --- a/drivers/can/Kconfig.stm32 +++ b/drivers/can/Kconfig.stm32 @@ -1,5 +1,6 @@ # STM32 CAN configuration options +# Copyright (c) 2022 Blue Clover # Copyright (c) 2018-2020 Alexander Wachter # SPDX-License-Identifier: Apache-2.0 @@ -72,3 +73,10 @@ config CAN_MAX_EXT_ID_FILTER that can be added by the application. endif # CAN_STM32_FDCAN + +config CAN_STM32H7 + bool "STM32H7 FDCAN driver" + default y + depends on DT_HAS_ST_STM32H7_FDCAN_ENABLED + select CAN_MCAN + select USE_STM32_LL_RCC diff --git a/drivers/can/Kconfig.stm32h7 b/drivers/can/Kconfig.stm32h7 deleted file mode 100644 index ec1668db01c..00000000000 --- a/drivers/can/Kconfig.stm32h7 +++ /dev/null @@ -1,11 +0,0 @@ -# STM32H7 FD-CAN configuration options - -# Copyright (c) 2022 Blue Clover -# SPDX-License-Identifier: Apache-2.0 - -config CAN_STM32H7 - bool "STM32H7 FDCAN driver" - default y - depends on DT_HAS_ST_STM32H7_FDCAN_ENABLED - select CAN_MCAN - select USE_STM32_LL_RCC