1.1 --- a/config/arch/alpha.in	Sat Sep 11 23:41:25 2010 +0200
     1.2 +++ b/config/arch/alpha.in	Sun Sep 12 00:05:46 2010 +0200
     1.3 @@ -8,58 +8,3 @@
     1.4      select ARCH_SUPPORT_TUNE
     1.5      help
     1.6        The Alpha architecture.
     1.7 -
     1.8 -choice
     1.9 -    bool
    1.10 -    prompt "Variant"
    1.11 -
    1.12 -config ARCH_ALPHA_EV4
    1.13 -    bool
    1.14 -    prompt "EV4"
    1.15 -
    1.16 -config ARCH_ALPHA_EV45
    1.17 -    bool
    1.18 -    prompt "EV45"
    1.19 -
    1.20 -config ARCH_ALPHA_EV5
    1.21 -    bool
    1.22 -    prompt "EV5"
    1.23 -
    1.24 -config ARCH_ALPHA_EV56
    1.25 -    bool
    1.26 -    prompt "EV56"
    1.27 -
    1.28 -config ARCH_ALPHA_EV6
    1.29 -    bool
    1.30 -    prompt "EV6"
    1.31 -
    1.32 -config ARCH_ALPHA_EV67
    1.33 -    bool
    1.34 -    prompt "EV67"
    1.35 -
    1.36 -endchoice
    1.37 -
    1.38 -config ARCH_ALPHA_VARIANT
    1.39 -    string
    1.40 -    default "ev4"   if ARCH_ALPHA_EV4
    1.41 -    default "ev45"  if ARCH_ALPHA_EV45
    1.42 -    default "ev5"   if ARCH_ALPHA_EV5
    1.43 -    default "ev56"  if ARCH_ALPHA_EV56
    1.44 -    default "ev6"   if ARCH_ALPHA_EV6
    1.45 -    default "ev67"  if ARCH_ALPHA_EV67
    1.46 -
    1.47 -config ARCH_CPU
    1.48 -    default "ev4"   if ARCH_ALPHA_EV4
    1.49 -    default "ev45"  if ARCH_ALPHA_EV45
    1.50 -    default "ev5"   if ARCH_ALPHA_EV5
    1.51 -    default "ev56"  if ARCH_ALPHA_EV56
    1.52 -    default "ev6"   if ARCH_ALPHA_EV6
    1.53 -    default "ev67"  if ARCH_ALPHA_EV67
    1.54 -
    1.55 -config ARCH_TUNE
    1.56 -    default "ev4"   if ARCH_ALPHA_EV4
    1.57 -    default "ev45"  if ARCH_ALPHA_EV45
    1.58 -    default "ev5"   if ARCH_ALPHA_EV5
    1.59 -    default "ev56"  if ARCH_ALPHA_EV56
    1.60 -    default "ev6"   if ARCH_ALPHA_EV6
    1.61 -    default "ev67"  if ARCH_ALPHA_EV67

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/config/arch/alpha.in.2	Sun Sep 12 00:05:46 2010 +0200
     2.3 @@ -0,0 +1,56 @@
     2.4 +# Alpha specific configuration file
     2.5 +
     2.6 +choice
     2.7 +    bool
     2.8 +    prompt "Variant"
     2.9 +
    2.10 +config ARCH_ALPHA_EV4
    2.11 +    bool
    2.12 +    prompt "EV4"
    2.13 +
    2.14 +config ARCH_ALPHA_EV45
    2.15 +    bool
    2.16 +    prompt "EV45"
    2.17 +
    2.18 +config ARCH_ALPHA_EV5
    2.19 +    bool
    2.20 +    prompt "EV5"
    2.21 +
    2.22 +config ARCH_ALPHA_EV56
    2.23 +    bool
    2.24 +    prompt "EV56"
    2.25 +
    2.26 +config ARCH_ALPHA_EV6
    2.27 +    bool
    2.28 +    prompt "EV6"
    2.29 +
    2.30 +config ARCH_ALPHA_EV67
    2.31 +    bool
    2.32 +    prompt "EV67"
    2.33 +
    2.34 +endchoice
    2.35 +
    2.36 +config ARCH_ALPHA_VARIANT
    2.37 +    string
    2.38 +    default "ev4"   if ARCH_ALPHA_EV4
    2.39 +    default "ev45"  if ARCH_ALPHA_EV45
    2.40 +    default "ev5"   if ARCH_ALPHA_EV5
    2.41 +    default "ev56"  if ARCH_ALPHA_EV56
    2.42 +    default "ev6"   if ARCH_ALPHA_EV6
    2.43 +    default "ev67"  if ARCH_ALPHA_EV67
    2.44 +
    2.45 +config ARCH_CPU
    2.46 +    default "ev4"   if ARCH_ALPHA_EV4
    2.47 +    default "ev45"  if ARCH_ALPHA_EV45
    2.48 +    default "ev5"   if ARCH_ALPHA_EV5
    2.49 +    default "ev56"  if ARCH_ALPHA_EV56
    2.50 +    default "ev6"   if ARCH_ALPHA_EV6
    2.51 +    default "ev67"  if ARCH_ALPHA_EV67
    2.52 +
    2.53 +config ARCH_TUNE
    2.54 +    default "ev4"   if ARCH_ALPHA_EV4
    2.55 +    default "ev45"  if ARCH_ALPHA_EV45
    2.56 +    default "ev5"   if ARCH_ALPHA_EV5
    2.57 +    default "ev56"  if ARCH_ALPHA_EV56
    2.58 +    default "ev6"   if ARCH_ALPHA_EV6
    2.59 +    default "ev67"  if ARCH_ALPHA_EV67