1.1 --- a/config/target.in	Tue Nov 17 09:27:38 2009 +0100
     1.2 +++ b/config/target.in	Tue Nov 17 22:29:50 2009 +0100
     1.3 @@ -5,13 +5,6 @@
     1.4  config ARCH
     1.5      string
     1.6  
     1.7 -# Note: when all archs have migrated to the 32/64 bit selection,
     1.8 -# remove this option, and rename the config options in the bitness
     1.9 -# choice, below.
    1.10 -config ARCH_64
    1.11 -    bool
    1.12 -    default n
    1.13 -
    1.14  # Pre-declare target optimisation variables
    1.15  config ARCH_SUPPORTS_BOTH_MMU
    1.16  config ARCH_SUPPORTS_BOTH_ENDIAN
    1.17 @@ -36,8 +29,8 @@
    1.18  config ARCH_FPU
    1.19  config ARCH_BE
    1.20  config ARCH_LE
    1.21 -config ARCH_32b
    1.22 -config ARCH_64b
    1.23 +config ARCH_32
    1.24 +config ARCH_64
    1.25  config ARCH_FLOAT_HW
    1.26  config ARCH_FLOAT_SW
    1.27  config TARGET_CFLAGS
    1.28 @@ -122,19 +115,18 @@
    1.29  choice
    1.30      bool
    1.31      prompt "Bitness:"
    1.32 -    default ARCH_32b if ARCH_DEFAULT_32
    1.33 -    default ARCH_64b if ARCH_DEFAULT_64
    1.34 +    default ARCH_32 if ARCH_DEFAULT_32
    1.35 +    default ARCH_64 if ARCH_DEFAULT_64
    1.36  
    1.37 -config ARCH_32b
    1.38 +config ARCH_32
    1.39      bool
    1.40      prompt "32-bit"
    1.41      depends on ARCH_SUPPORTS_32
    1.42  
    1.43 -config ARCH_64b
    1.44 +config ARCH_64
    1.45      bool
    1.46      prompt "64-bit"
    1.47      depends on ARCH_SUPPORTS_64
    1.48 -    select ARCH_64
    1.49  
    1.50  endchoice
    1.51