From 514f1546d7fe83853c2c2020514e61a90cc26f95 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Thu, 26 Nov 2015 05:07:37 -0800
Subject: config: Update kconfig for new CT_GetCustom

This commit sort of unifies the kconfigs to handle custom files and
directories.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
---
 config/binutils/binutils.in.2 | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

(limited to 'config/binutils/binutils.in.2')

diff --git a/config/binutils/binutils.in.2 b/config/binutils/binutils.in.2
index cb6c81cf..e3d3799c 100644
--- a/config/binutils/binutils.in.2
+++ b/config/binutils/binutils.in.2
@@ -18,12 +18,12 @@ config ELF2FLT_CUSTOM
     bool
     prompt "Custom elf2flt"
     depends on EXPERIMENTAL
+    help
+      The choosen elf2flt version shall be not downloaded. Instead use
+      a custom location to get the source.
 
 endchoice
 
-config ELF2FLT_VERSION
-    string
-
 if ELF2FLT_GIT
 
 config ELF2FLT_GIT_CSET
@@ -35,23 +35,30 @@ config ELF2FLT_GIT_CSET
 
       The default currently points to the HEAD of the git tree.
 
-config ELF2FLT_VERSION
-    default ELF2FLT_GIT_CSET
-
 endif # ELF2FLT_GIT
 
-if ELF2FLT_CUSTOM
-
 config ELF2FLT_VERSION
-    default "custom"
+    string
+    default ELF2FLT_GIT_CSET if ELF2FLT_GIT
+    default ELF2FLT_CUSTOM_VERSION if ELF2FLT_CUSTOM
+
+if ELF2FLT_CUSTOM
 
 config ELF2FLT_CUSTOM_LOCATION
     string
     prompt "Full path to custom elf2flt source"
-    default ""
     help
-      Enter the path to the directory (or tarball) of your source for elf2flt,
-      or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/elf2flt
+      Enter the path to the directory or tarball of your source for elf2flt.
+
+      If the path is a tarball, it should extract to: <name>-<version>/
+      where the name is this component, elf2flt, and the version is set
+      below in the custom version string.
+
+config ELF2FLT_CUSTOM_VERSION
+    string
+    prompt "elf2flt custom version number"
+    help
+      Enter the version number for your custom elf2flt.
 
 endif # ELF2FLT_CUSTOM
 
@@ -66,4 +73,4 @@ config ELF2FLT_EXTRA_CONFIG_ARRAY
       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
+endif # ARCH_BINFMT_FLAT
-- 
cgit v1.2.3