diff mbox series

[2/2] alpha: merge two entries for CONFIG_ALPHA_GAMMA

Message ID 20240215141120.1911369-2-masahiroy@kernel.org
State New
Headers
Series [1/2] alpha: merge two entries for CONFIG_ALPHA_EV4 |

Commit Message

Masahiro Yamada Feb. 15, 2024, 2:11 p.m. UTC 
  There are two entries for CONFIG_ALPHA_GAMMA, with the second one
7 lines below. Merge them together.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 arch/alpha/Kconfig | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Randy Dunlap Feb. 15, 2024, 11:27 p.m. UTC | #1 
Hi,

On 2/15/24 06:11, Masahiro Yamada wrote:
> There are two entries for CONFIG_ALPHA_GAMMA, with the second one
> 7 lines below. Merge them together.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
> 
>  arch/alpha/Kconfig | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
> index 70e8343d00ba..581ca8c73d67 100644
> --- a/arch/alpha/Kconfig
> +++ b/arch/alpha/Kconfig
> @@ -390,16 +390,12 @@ config ALPHA_PRIMO
>  	  Say Y if you have an AS 1000 5/xxx or an AS 1000A 5/xxx.
>  
>  config ALPHA_GAMMA
> -	bool "EV5 CPU(s) (model 5/xxx)?"
> -	depends on ALPHA_SABLE
> +	bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_SABLE
> +	depends on ALPHA_SABLE || ALPHA_GAMMA

	depends on ALPHA_SABLE || ALPHA_LYNX
??

> +	default ALPHA_LYNX
>  	help
>  	  Say Y if you have an AS 2000 5/xxx or an AS 2100 5/xxx.
>  
> -config ALPHA_GAMMA
> -	bool
> -	depends on ALPHA_LYNX
> -	default y
> -
>  config ALPHA_T2
>  	bool
>  	depends on ALPHA_SABLE || ALPHA_LYNX
Masahiro Yamada Feb. 16, 2024, 2:13 a.m. UTC | #2 
On Fri, Feb 16, 2024 at 8:28 AM Randy Dunlap <rdunlap@infradead.org> wrote:
>
> Hi,
>
> On 2/15/24 06:11, Masahiro Yamada wrote:
> > There are two entries for CONFIG_ALPHA_GAMMA, with the second one
> > 7 lines below. Merge them together.
> >
> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > ---
> >
> >  arch/alpha/Kconfig | 10 +++-------
> >  1 file changed, 3 insertions(+), 7 deletions(-)
> >
> > diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
> > index 70e8343d00ba..581ca8c73d67 100644
> > --- a/arch/alpha/Kconfig
> > +++ b/arch/alpha/Kconfig
> > @@ -390,16 +390,12 @@ config ALPHA_PRIMO
> >         Say Y if you have an AS 1000 5/xxx or an AS 1000A 5/xxx.
> >
> >  config ALPHA_GAMMA
> > -     bool "EV5 CPU(s) (model 5/xxx)?"
> > -     depends on ALPHA_SABLE
> > +     bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_SABLE
> > +     depends on ALPHA_SABLE || ALPHA_GAMMA
>
>         depends on ALPHA_SABLE || ALPHA_LYNX
> ??


Oops.

You are right. I will fix it in v2.





>
> > +     default ALPHA_LYNX
> >       help
> >         Say Y if you have an AS 2000 5/xxx or an AS 2100 5/xxx.
> >
> > -config ALPHA_GAMMA
> > -     bool
> > -     depends on ALPHA_LYNX
> > -     default y
> > -
> >  config ALPHA_T2
> >       bool
> >       depends on ALPHA_SABLE || ALPHA_LYNX
>
> --
> #Randy
diff mbox series

Patch

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 70e8343d00ba..581ca8c73d67 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -390,16 +390,12 @@  config ALPHA_PRIMO
 	  Say Y if you have an AS 1000 5/xxx or an AS 1000A 5/xxx.
 
 config ALPHA_GAMMA
-	bool "EV5 CPU(s) (model 5/xxx)?"
-	depends on ALPHA_SABLE
+	bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_SABLE
+	depends on ALPHA_SABLE || ALPHA_GAMMA
+	default ALPHA_LYNX
 	help
 	  Say Y if you have an AS 2000 5/xxx or an AS 2100 5/xxx.
 
-config ALPHA_GAMMA
-	bool
-	depends on ALPHA_LYNX
-	default y
-
 config ALPHA_T2
 	bool
 	depends on ALPHA_SABLE || ALPHA_LYNX