diff -r 95c28d483690 -r 27165f6184f2 config/target.in
--- a/config/target.in	Tue Nov 17 09:27:38 2009 +0100
+++ b/config/target.in	Tue Nov 17 22:29:50 2009 +0100
@@ -5,13 +5,6 @@
 config ARCH
     string
 
-# Note: when all archs have migrated to the 32/64 bit selection,
-# remove this option, and rename the config options in the bitness
-# choice, below.
-config ARCH_64
-    bool
-    default n
-
 # Pre-declare target optimisation variables
 config ARCH_SUPPORTS_BOTH_MMU
 config ARCH_SUPPORTS_BOTH_ENDIAN
@@ -36,8 +29,8 @@
 config ARCH_FPU
 config ARCH_BE
 config ARCH_LE
-config ARCH_32b
-config ARCH_64b
+config ARCH_32
+config ARCH_64
 config ARCH_FLOAT_HW
 config ARCH_FLOAT_SW
 config TARGET_CFLAGS
@@ -122,19 +115,18 @@
 choice
     bool
     prompt "Bitness:"
-    default ARCH_32b if ARCH_DEFAULT_32
-    default ARCH_64b if ARCH_DEFAULT_64
+    default ARCH_32 if ARCH_DEFAULT_32
+    default ARCH_64 if ARCH_DEFAULT_64
 
-config ARCH_32b
+config ARCH_32
     bool
     prompt "32-bit"
     depends on ARCH_SUPPORTS_32
 
-config ARCH_64b
+config ARCH_64
     bool
     prompt "64-bit"
     depends on ARCH_SUPPORTS_64
-    select ARCH_64
 
 endchoice