From f5956b539557a9937115c3bed1ad7dc8769db3d4 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 28 May 2025 14:50:28 -0400 Subject: [PATCH] stm32: Simplify Kconfig HAVE_STM32_CANBUS checks Avoid unnecessary (HAVE_STM32_CANBUS && MACH_STM32xx) checks in Kconfig. The HAVE_STM32_CANBUS is a helper symbol for all the chips that support canbus, there's no need to mix it with a check for a chip that is already known to have canbus. Signed-off-by: Kevin O'Connor --- src/stm32/Kconfig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/stm32/Kconfig b/src/stm32/Kconfig index 622bc09f..e78fda5e 100644 --- a/src/stm32/Kconfig +++ b/src/stm32/Kconfig @@ -447,7 +447,7 @@ choice select CANSERIAL config STM32_CANBUS_PA11_PA12_REMAP bool "CAN bus (on PA9/PA10)" if LOW_LEVEL_OPTIONS - depends on HAVE_STM32_CANBUS && (MACH_STM32F042 || MACH_STM32F070x6) + depends on MACH_STM32F042 select CANSERIAL config STM32_CANBUS_PA11_PB9 bool "CAN bus (on PA11/PB9)" @@ -459,15 +459,15 @@ choice select CANSERIAL config STM32_MMENU_CANBUS_PI9_PH13 bool "CAN bus (on PI9/PH13)" if LOW_LEVEL_OPTIONS - depends on HAVE_STM32_CANBUS && MACH_STM32F4 + depends on (MACH_STM32F4 && HAVE_STM32_CANBUS) select CANSERIAL config STM32_MMENU_CANBUS_PB5_PB6 bool "CAN bus (on PB5/PB6)" if LOW_LEVEL_OPTIONS - depends on HAVE_STM32_CANBUS && MACH_STM32F4 + depends on (MACH_STM32F4 && HAVE_STM32_CANBUS) select CANSERIAL config STM32_MMENU_CANBUS_PB12_PB13 bool "CAN bus (on PB12/PB13)" if LOW_LEVEL_OPTIONS - depends on (HAVE_STM32_CANBUS && MACH_STM32F4) || HAVE_STM32_FDCANBUS + depends on (MACH_STM32F4 && HAVE_STM32_CANBUS) || HAVE_STM32_FDCANBUS select CANSERIAL config STM32_MMENU_CANBUS_PD0_PD1 bool "CAN bus (on PD0/PD1)" if LOW_LEVEL_OPTIONS @@ -500,13 +500,13 @@ choice bool "CAN bus (on PB8/PB9)" config STM32_CMENU_CANBUS_PI9_PH13 bool "CAN bus (on PI9/PH13)" - depends on HAVE_STM32_CANBUS && MACH_STM32F4 + depends on (MACH_STM32F4 && HAVE_STM32_CANBUS) config STM32_CMENU_CANBUS_PB5_PB6 bool "CAN bus (on PB5/PB6)" - depends on (HAVE_STM32_CANBUS && MACH_STM32F4) || (HAVE_STM32_FDCANBUS && MACH_STM32G0B1) + depends on (MACH_STM32F4 && HAVE_STM32_CANBUS) || MACH_STM32G0B1 config STM32_CMENU_CANBUS_PB12_PB13 bool "CAN bus (on PB12/PB13)" - depends on (HAVE_STM32_CANBUS && MACH_STM32F4) || HAVE_STM32_FDCANBUS + depends on (MACH_STM32F4 && HAVE_STM32_CANBUS) || HAVE_STM32_FDCANBUS config STM32_CMENU_CANBUS_PD0_PD1 bool "CAN bus (on PD0/PD1)" depends on HAVE_STM32_CANBUS || HAVE_STM32_FDCANBUS