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 | 54 +++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 17 deletions(-)

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

diff --git a/config/binutils/binutils.in b/config/binutils/binutils.in
index fc574125..ef598707 100644
--- a/config/binutils/binutils.in
+++ b/config/binutils/binutils.in
@@ -2,6 +2,41 @@
 
 comment "GNU binutils"
 
+config BINUTILS_CUSTOM
+    bool
+    prompt "Custom binutils"
+    depends on EXPERIMENTAL
+    select BINUTILS_2_25_or_later
+    help
+      The choosen binutils version shall be not downloaded. Instead use
+      a custom location to get the source.
+
+if BINUTILS_CUSTOM
+
+config BINUTILS_CUSTOM_LOCATION
+    string
+    prompt "Full path to custom binutils source"
+    help
+      Enter the path to the directory or tarball of your source for binutils.
+
+      If the path is a tarball, it should extract to: <name>-<version>/
+      where the name is this component, binutils, and the version is set
+      below in the custom version string.
+
+config BINUTILS_CUSTOM_VERSION
+    string
+    prompt "Binutils Custom Version number"
+    help
+      Enter the version number for your custom binutils.
+
+config BINUTILS_VERSION
+    string
+    default BINUTILS_CUSTOM_VERSION
+
+endif # BINUTILS_CUSTOM
+
+if ! BINUTILS_CUSTOM
+
 config CC_BINUTILS_SHOW_LINARO
     bool
     prompt "Show Linaro versions"
@@ -94,23 +129,6 @@ config BINUTILS_V_2_18a
 
 endchoice
 
-config BINUTILS_CUSTOM
-    bool
-    prompt "Custom binutils"
-    depends on EXPERIMENTAL
-
-if BINUTILS_CUSTOM
-
-config BINUTILS_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom binutils source"
-    default ""
-    help
-      Enter the path to the directory (or tarball) of your source for binutils,
-      or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/binutils
-
-endif # BINUTILS_CUSTOM
-
 config BINUTILS_VERSION
     string
 # Don't remove next line
@@ -129,6 +147,8 @@ config BINUTILS_VERSION
     default "2.19.1a" if BINUTILS_V_2_19_1a
     default "2.18a" if BINUTILS_V_2_18a
 
+endif # ! BINUTILS_CUSTOM
+
 config BINUTILS_2_25_1_or_later
     bool
     select BINUTILS_2_25_or_later
-- 
cgit v1.2.3