diff -r 2b64e1b502cd -r f32c0f8ffaa3 config/binutils.in
--- a/config/binutils.in	Mon Nov 19 11:19:54 2012 +0100
+++ b/config/binutils.in	Mon Nov 19 21:39:58 2012 +0100
@@ -6,22 +6,18 @@
     bool
     prompt "Binary format:"
 
-if ARCH_USE_MMU || BARE_METAL
-
 config ARCH_BINFMT_ELF
     bool
     prompt "ELF"
+    depends on ARCH_USE_MMU || BARE_METAL
     help
       This will make your system build ELF executables,
       suitable for architectures with an MMU.
 
-endif # ARCH_USE_MMU
-
-if ! ARCH_USE_MMU
-
 config ARCH_BINFMT_FLAT
     bool
     prompt "Flat"
+    depends on ! ARCH_USE_MMU
     help
       This will build flat binaries, suitable for
       MMU-less architectures.
@@ -29,13 +25,12 @@
 config ARCH_BINFMT_FDPIC
     bool
     prompt "FD_PIC ELF"
+    depends on ! ARCH_USE_MMU
     help
       This will build FD_PIC ELF binaries, suitable for
       MMU-less architectures that still require to use
       shared libraries (FIXME).
 
-endif # ! ARCH_USE_MMU
-
 endchoice
 
 source "config/binutils/binutils.in"