[PATCH] ARM: stm32: use "depends on" instead of "if" after prompt

[PATCH] ARM: stm32: use "depends on" instead of "if" after prompt

[Masahiro Yamada]

This appeared after the global fixups by commit e32465429490 ("ARM: use
"depends on" for SoC configs instead of "if" after prompt"). Fix it now.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/mach-stm32/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
index 05d6b5aada80..57699bd8f107 100644
--- a/arch/arm/mach-stm32/Kconfig
+++ b/arch/arm/mach-stm32/Kconfig
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 menuconfig ARCH_STM32
-	bool "STMicroelectronics STM32 family" if ARM_SINGLE_ARMV7M || ARCH_MULTI_V7
+	bool "STMicroelectronics STM32 family"
+	depends on ARM_SINGLE_ARMV7M || ARCH_MULTI_V7
 	select ARMV7M_SYSTICK if ARM_SINGLE_ARMV7M
 	select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
 	select ARM_GIC if ARCH_MULTI_V7
-- 
2.17.1

Re: [PATCH] ARM: stm32: use "depends on" instead of "if" after prompt

[Masahiro Yamada]

Hi Olof,



On Wed, Jul 10, 2019 at 2:15 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> This appeared after the global fixups by commit e32465429490 ("ARM: use
> "depends on" for SoC configs instead of "if" after prompt"). Fix it now.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---


I think probably this is too late,
but I am afraid you silently added a wrong Fixes tag.




commit 7e8a0f10899075ac2665c78c4e49dbaf32bf3346
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
Date:   Wed Jul 10 14:13:20 2019 +0900

    ARM: stm32: use "depends on" instead of "if" after prompt

    This appeared after the global fixups by commit e32465429490 ("ARM: use
    "depends on" for SoC configs instead of "if" after prompt"). Fix it now.

    Link: https://lore.kernel.org/r/20190710051320.8738-1-yamada.masahiro@socionext.com
    Fixes: e32465429490 ("ARM: use "depends on" for SoC configs
instead of "if" after prompt")
    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Signed-off-by: Olof Johansson <olof@lixom.net>





Commit e32465429490 converted all instances at that time.
This is absolutely fine.


Later, in 2018, commit 3ed71f8ad98a added a new instance.

So, if this Fixes is wanted, it should have been
Fixes: 3ed71f8ad98a ("ARM: stm32: prepare stm32 family to welcome
armv7 architecture")


This would confuse the stable kernel maintainers.



>  arch/arm/mach-stm32/Kconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
> index 05d6b5aada80..57699bd8f107 100644
> --- a/arch/arm/mach-stm32/Kconfig
> +++ b/arch/arm/mach-stm32/Kconfig
> @@ -1,6 +1,7 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  menuconfig ARCH_STM32
> -       bool "STMicroelectronics STM32 family" if ARM_SINGLE_ARMV7M || ARCH_MULTI_V7
> +       bool "STMicroelectronics STM32 family"
> +       depends on ARM_SINGLE_ARMV7M || ARCH_MULTI_V7
>         select ARMV7M_SYSTICK if ARM_SINGLE_ARMV7M
>         select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7
>         select ARM_GIC if ARCH_MULTI_V7
> --
> 2.17.1
>


-- 
Best Regards
Masahiro Yamada