Merge the uClinux/noMMU stuff back to /trunk:

- merge Linux and uClinux back to a single kernel
- add ARCH_USE_MMU and acquainted config options that
  architectures can auto-select
- make binutils and elf2flt two "Binary utilities" that
  go in a single common sub-{menu,directory} structure

 -------- diffstat follows --------
 /trunk/scripts/build/kernel/uclinux.sh      |    2     0     2     0 -
 /trunk/scripts/build/kernel/linux.sh        |  206   204     2     0 +++++++++++++++++++++++++++++
 /trunk/scripts/build/kernel/linux-common.sh |  198     0   198     0 ----------------------------
 /trunk/scripts/build/binutils.sh            |  232     0   232     0 --------------------------------
 /trunk/scripts/build/elf2flt.sh             |  150     0   150     0 ---------------------
 /trunk/scripts/crosstool-NG.sh.in           |    6     4     2     0 +
 /trunk/config/kernel/linux.in               |  249   249     0     0 +++++++++++++++++++++++++++++++++++
 /trunk/config/kernel/linux.in-common        |  252     0   252     0 -----------------------------------
 /trunk/config/kernel/uclinux.in             |   21     0    21     0 ---
 /trunk/config/target.in                     |   23    22     1     0 +++
 /trunk/config/elf2flt.in                    |   49     0    49     0 -------
 /trunk/config/libc/glibc.in                 |    2     1     1     0
 /trunk/config/libc/eglibc.in                |    2     1     1     0
 /trunk/config/config.in                     |    1     0     1     0 -
 /trunk/config/arch/sh.in                    |    1     1     0     0 +
 /trunk/config/arch/arm.in                   |    2     1     1     0
 /trunk/config/arch/powerpc.in               |    1     1     0     0 +
 /trunk/config/arch/ia64.in                  |    1     1     0     0 +
 /trunk/config/arch/alpha.in                 |    1     1     0     0 +
 /trunk/config/arch/x86.in                   |    1     1     0     0 +
 /trunk/config/arch/mips.in                  |    1     1     0     0 +
 /trunk/config/arch/powerpc64.in             |    1     1     0     0 +
 22 files changed, 489 insertions(+), 913 deletions(-)

1 files changed, 24 insertions, 140 deletions

diff --git a/config/binutils.in b/config/binutils.in
index 119e3d3..836d251 100644
--- a/config/binutils.in
+++ b/config/binutils.in
@@ -1,160 +1,44 @@
-# binutils options
+# Binary utilities menu
 
-menu "binutils"
-
-config BINUTILS_VERSION
-    string
+menu "Binary utilities"
 
 choice
     bool
-    prompt "binutils version"
-
-config BINUTILS_V_2_14
-    bool
-    prompt "2.14 (OBSOLETE)"
-    depends on OBSOLETE
+    prompt "Binary format:"
 
-config BINUTILS_V_2_15
-    bool
-    prompt "2.15 (OBSOLETE)"
-    depends on OBSOLETE
-
-config BINUTILS_V_2_16_1
-    bool
-    prompt "2.16.1"
+if ARCH_USE_MMU
 
-config BINUTILS_V_2_17
+config ARCH_BINFMT_ELF
     bool
-    prompt "2.17"
-
-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"
+    prompt "ELF"
+    help
+      This will make your system build ELF exectubales,
+      suitable for architectures with an MMU.
 
-config BINUTILS_V_2_19_50_0_1
-    bool
-    prompt "2.19.50.0.1 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+endif # ARCH_USE_MMU
 
-config BINUTILS_V_2_19_51_0_1
-    bool
-    prompt "2.19.51.0.1  (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+if ! ARCH_USE_MMU
 
-config BINUTILS_V_2_19_51_0_2
+config ARCH_BINFMT_FLAT
     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 ""
+    prompt "Flat"
     help
-      Extra flags passed onto ./configure when configuring
+      This will build flat binaries, suitable for
+      MMU-less architectures.
 
-config BINUTILS_FOR_TARGET
+config ARCH_BINFMT_FDPIC
     bool
-    prompt "binutils libraries for the target"
-    depends on ! BARE_METAL
-    default n
+    prompt "FD_PIC ELF"
     help
-      Some utilities may need binutils libraries to be available on
-      the target, eg. oprofile.
-
-if BINUTILS_FOR_TARGET
+      This will build FD_PIC ELF binaries, suitable for
+      MMU-less architectures that still require to use
+      shared libraries (FIXME).
 
-config BINUTILS_FOR_TARGET_IBERTY
-    bool
-    prompt "libiberty"
-    default y
+endif # ! ARCH_USE_MMU
 
-config BINUTILS_FOR_TARGET_BFD
-    bool
-    prompt "libbfd"
-    default y
+endchoice
 
-endif # BINUTILS_FOR_TARGET
+source config/binutils/binutils.in
+source config/binutils/elf2flt.in
 
 endmenu