From af479f10530a53861eae1f8a144e87cb012f708f Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Fri, 7 Jul 2017 16:08:28 -0700
Subject: Merge elf2flt into binutils.in

It was previously picked up as "tail options" config file, .in.2.
Now we only have a single config file for each component.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index 908395d..3cb58f9 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -180,3 +180,27 @@ config BINUTILS_FOR_TARGET_BFD
     default y
 
 endif # BINUTILS_FOR_TARGET
+
+if ARCH_BINFMT_FLAT
+
+comment "elf2flt"
+
+config ELF2FLT_REQUIRES
+    def_bool y
+    select ZLIB
+    select BINUTILS_FORCE_LD_BFD_ONLY
+
+source "config/versions/elf2flt.in"
+
+config ELF2FLT_EXTRA_CONFIG_ARRAY
+    string
+    prompt "elf2flt extra config"
+    default ""
+    help
+      Extra flags passed onto ./configure when configuring
+      
+      You can enter multiple arguments here, and arguments can contain spaces
+      if they are properly quoted (or escaped, but prefer quotes). Eg.:
+          --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
+
+endif # ARCH_BINFMT_FLAT
diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2
deleted file mode 100644
index 29ae543..0000000
--- a/config/binutils/binutils.in.2
+++ /dev/null
@@ -1,25 +0,0 @@
-# elf2flt options
-
-if ARCH_BINFMT_FLAT
-
-config ELF2FLT_REQUIRES
-    def_bool y
-    select ZLIB
-    select BINUTILS_FORCE_LD_BFD_ONLY
-
-comment "elf2flt"
-
-source "config/versions/elf2flt.in"
-
-config ELF2FLT_EXTRA_CONFIG_ARRAY
-    string
-    prompt "elf2flt extra config"
-    default ""
-    help
-      Extra flags passed onto ./configure when configuring
-      
-      You can enter multiple arguments here, and arguments can contain spaces
-      if they are properly quoted (or escaped, but prefer quotes). Eg.:
-          --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
-
-endif # ARCH_BINFMT_FLAT
-- 
cgit v0.10.2-6-g49f6