diff -r cc07c1ef372d -r 27fec561af53 config/binutils.in
--- a/config/binutils.in	Thu Mar 05 17:38:05 2009 +0000
+++ b/config/binutils.in	Wed May 20 20:13:13 2009 +0000
@@ -1,160 +1,44 @@
-# binutils options
+# Binary utilities menu
 
-menu "binutils"
-
-config BINUTILS_VERSION
-    string
+menu "Binary utilities"
 
 choice
     bool
-    prompt "binutils version"
+    prompt "Binary format:"
 
-config BINUTILS_V_2_14
+if ARCH_USE_MMU
+
+config ARCH_BINFMT_ELF
     bool
-    prompt "2.14 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "ELF"
+    help
+      This will make your system build ELF exectubales,
+      suitable for architectures with an MMU.
 
-config BINUTILS_V_2_15
+endif # ARCH_USE_MMU
+
+if ! ARCH_USE_MMU
+
+config ARCH_BINFMT_FLAT
     bool
-    prompt "2.15 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "Flat"
+    help
+      This will build flat binaries, suitable for
+      MMU-less architectures.
 
-config BINUTILS_V_2_16_1
+config ARCH_BINFMT_FDPIC
     bool
-    prompt "2.16.1"
+    prompt "FD_PIC ELF"
+    help
+      This will build FD_PIC ELF binaries, suitable for
+      MMU-less architectures that still require to use
+      shared libraries (FIXME).
 
-config BINUTILS_V_2_17
-    bool
-    prompt "2.17"
+endif # ! ARCH_USE_MMU
 
-config BINUTILS_V_2_18
-    bool
-    prompt "2.18"
-
-config BINUTILS_V_2_18_50_0_4
-    bool
-    prompt "2.18.50.0.4 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_18_50_0_6
-    bool
-    prompt "2.18.50.0.6 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_18_50_0_7
-    bool
-    prompt "2.18.50.0.7 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_18_50_0_8
-    bool
-    prompt "2.18.50.0.8 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_18_50_0_9
-    bool
-    prompt "2.18.50.0.9 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_18_90
-    bool
-    prompt "2.18.90 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_18_91
-    bool
-    prompt "2.18.91 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_18_92
-    bool
-    prompt "2.18.92 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_18_93
-    bool
-    prompt "2.18.93 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_19
-    bool
-    prompt "2.19"
-
-config BINUTILS_V_2_19_1
-    bool
-    prompt "2.19.1"
-
-config BINUTILS_V_2_19_50_0_1
-    bool
-    prompt "2.19.50.0.1 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_19_51_0_1
-    bool
-    prompt "2.19.51.0.1  (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-config BINUTILS_V_2_19_51_0_2
-    bool
-    prompt "2.19.51.0.2  (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-
-# CT_INSERT_VERSION_ABOVE
-# Don't remove above line!
 endchoice
 
-config BINUTILS_VERSION
-    string
-    default "2.14" if BINUTILS_V_2_14
-    default "2.15" if BINUTILS_V_2_15
-    default "2.16.1" if BINUTILS_V_2_16_1
-    default "2.17" if BINUTILS_V_2_17
-    default "2.18" if BINUTILS_V_2_18
-    default "2.18.50.0.4" if BINUTILS_V_2_18_50_0_4
-    default "2.18.50.0.6" if BINUTILS_V_2_18_50_0_6
-    default "2.18.50.0.7" if BINUTILS_V_2_18_50_0_7
-    default "2.18.50.0.8" if BINUTILS_V_2_18_50_0_8
-    default "2.18.50.0.9" if BINUTILS_V_2_18_50_0_9
-    default "2.18.90" if BINUTILS_V_2_18_90
-    default "2.18.91" if BINUTILS_V_2_18_91
-    default "2.18.92" if BINUTILS_V_2_18_92
-    default "2.18.93" if BINUTILS_V_2_18_93
-    default "2.19" if BINUTILS_V_2_19
-    default "2.19.1" if BINUTILS_V_2_19_1
-    default "2.19.50.0.1" if BINUTILS_V_2_19_50_0_1
-    default "2.19.51.0.1" if BINUTILS_V_2_19_51_0_1
-    default "2.19.51.0.2" if BINUTILS_V_2_19_51_0_2
-# CT_INSERT_VERSION_STRING_ABOVE
-# Don't remove above line!
-
-config BINUTILS_EXTRA_CONFIG
-    string
-    prompt "binutils extra config"
-    default ""
-    help
-      Extra flags passed onto ./configure when configuring
-
-config BINUTILS_FOR_TARGET
-    bool
-    prompt "binutils libraries for the target"
-    depends on ! BARE_METAL
-    default n
-    help
-      Some utilities may need binutils libraries to be available on
-      the target, eg. oprofile.
-
-if BINUTILS_FOR_TARGET
-
-config BINUTILS_FOR_TARGET_IBERTY
-    bool
-    prompt "libiberty"
-    default y
-
-config BINUTILS_FOR_TARGET_BFD
-    bool
-    prompt "libbfd"
-    default y
-
-endif # BINUTILS_FOR_TARGET
+source config/binutils/binutils.in
+source config/binutils/elf2flt.in
 
 endmenu