2024-02-15 14:13:21

by Masahiro Yamada

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

There are two entries for CONFIG_ALPHA_GAMMA, with the second one
7 lines below. Merge them together.

Signed-off-by: Masahiro Yamada <[email protected]>
---

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

2024-02-15 23:28:18

by Randy Dunlap

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

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 <[email protected]>
> ---
>
> 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

2024-02-16 02:14:18

by Masahiro Yamada

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

On Fri, Feb 16, 2024 at 8:28 AM Randy Dunlap <[email protected]> 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 <[email protected]>
> > ---
> >
> > 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