[PATCH 1/2] alpha: merge two entries for CONFIG_ALPHA_EV4

[PATCH 1/2] alpha: merge two entries for CONFIG_ALPHA_EV4

[Masahiro Yamada]

There are two entries for CONFIG_ALPHA_EV4, on line 337 and line 368.
Merge them together.

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

 arch/alpha/Kconfig | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index d6968d090d49..70e8343d00ba 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -338,6 +338,7 @@ config ALPHA_EV4
 	bool
 	depends on ALPHA_JENSEN || (ALPHA_SABLE && !ALPHA_GAMMA) || ALPHA_LYNX || ALPHA_NORITAKE && !ALPHA_PRIMO || ALPHA_MIKASA && !ALPHA_PRIMO || ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P_CH || ALPHA_XL || ALPHA_NONAME || ALPHA_EB66 || ALPHA_EB66P || ALPHA_P2K
 	default y if !ALPHA_LYNX
+	default y if !ALPHA_EV5
 
 config ALPHA_LCA
 	bool
@@ -365,10 +366,6 @@ config ALPHA_EV5
 	bool "EV5 CPU(s) (model 5/xxx)?" if ALPHA_LYNX
 	default y if ALPHA_RX164 || ALPHA_RAWHIDE || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_SABLE && ALPHA_GAMMA || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR
 
-config ALPHA_EV4
-	bool
-	default y if ALPHA_LYNX && !ALPHA_EV5
-
 config ALPHA_CIA
 	bool
 	depends on ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_RUFFIAN || ALPHA_NORITAKE && ALPHA_PRIMO || ALPHA_MIKASA && ALPHA_PRIMO || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR
-- 
2.40.1

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

[Masahiro Yamada]

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
+	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
-- 
2.40.1

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

[Randy Dunlap]

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

-- 
#Randy

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

[Masahiro Yamada]

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



-- 
Best Regards
Masahiro Yamada