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>

5 files changed, 203 insertions, 83 deletions

diff --git a/config/libc/avr-libc.in b/config/libc/avr-libc.in
index 968ca6be..f08acb3a 100644
--- a/config/libc/avr-libc.in
+++ b/config/libc/avr-libc.in
@@ -9,6 +9,40 @@
 ## help Atmel AVR 8-bit RISC microcontrollers. In addition, the library
 ## help provides the basic startup code needed by most applications.
 
+config LIBC_AVR_LIBC_CUSTOM
+    bool
+    prompt "Custom avr-libc"
+    depends on EXPERIMENTAL
+    help
+      The choosen avr-libc version shall be not downloaded. Instead use
+      a custom location to get the source.
+
+if LIBC_AVR_LIBC_CUSTOM
+
+config LIBC_AVR_LIBC_CUSTOM_LOCATION
+    string
+    prompt "Full path to custom avr-libc source"
+    help
+      Enter the path to the directory or tarball of your source for avr-libc.
+
+      If the path is a tarball, it should extract to: <name>-<version>/
+      where the name is this component, avr-libc, and the version is set
+      below in the custom version string.
+
+config LIBC_AVR_LIBC_CUSTOM_VERSION
+    string
+    prompt "Custom AVR-Libc version"
+    help
+      Enter the version number for your custom avr-libc.
+
+config LIBC_VERSION
+    string
+    default LIBC_AVR_LIBC_CUSTOM_VERSION
+
+endif # LIBC_AVR_LIBC_CUSTOM
+
+if ! LIBC_AVR_LIBC_CUSTOM
+
 choice
     bool
     prompt "avr-libc version"
@@ -23,29 +57,13 @@ config LIBC_AVR_LIBC_V_1_8_0
     bool
     prompt "1.8.0"
 
-config LIBC_AVR_LIBC_CUSTOM
-    bool
-    prompt "Custom avr-libc"
-    depends on EXPERIMENTAL
-
 endchoice
 
-if LIBC_AVR_LIBC_CUSTOM
-
-config LIBC_AVR_LIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom avr-libc source"
-    default ""
-    help
-      Enter the path to the directory (or tarball) of your source for avr-libc,
-      or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/avr-libc
-
-endif # LIBC_AVR_LIBC_CUSTOM
-
 config LIBC_VERSION
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
     default "1.8.1" if LIBC_AVR_LIBC_V_1_8_1
     default "1.8.0" if LIBC_AVR_LIBC_V_1_8_0
-    default "custom" if LIBC_AVR_LIBC_CUSTOM
+
+endif # ! LIBC_AVR_LIBC_CUSTOM
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index c2ba7b91..97b0107f 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -12,6 +12,42 @@
 config THREADS
     default "nptl"
 
+config LIBC_GLIBC_CUSTOM
+    bool
+    prompt "Custom glibc"
+    depends on EXPERIMENTAL
+    select LIBC_CUSTOM
+    select LIBC_GLIBC_2_20_or_later
+    help
+      The choosen glibc version shall be not downloaded. Instead use
+      a custom location to get the source.
+
+if LIBC_GLIBC_CUSTOM
+
+config LIBC_GLIBC_CUSTOM_LOCATION
+    string
+    prompt "Full path to custom glibc source"
+    help
+      Enter the path to the directory or tarball of your source for glibc.
+
+      If the path is a tarball, it should extract to: <name>-<version>/
+      where the name is this component, glibc, and the version is set
+      below in the custom version string.
+
+config LIBC_GLIBC_CUSTOM_VERSION
+    string
+    prompt "Custom GLIBC version"
+    help
+      Enter the version number for your custom glibc.
+
+config LIBC_VERSION
+    string
+    default LIBC_GLIBC_CUSTOM_VERSION
+
+endif # LIBC_GLIBC_CUSTOM
+
+if ! LIBC_GLIBC_CUSTOM
+
 config CC_GLIBC_SHOW_LINARO
     bool
     prompt "Show Linaro versions"
@@ -132,15 +168,10 @@ config LIBC_GLIBC_V_2_8
     prompt "2.8"
     select LIBC_GLIBC_PORTS_EXTERNAL
 
-config LIBC_GLIBC_CUSTOM
-    bool
-    prompt "Custom glibc"
-    depends on EXPERIMENTAL
-    select LIBC_CUSTOM
-    select LIBC_GLIBC_2_20_or_later
-
 endchoice
 
+endif # ! LIBC_GLIBC_CUSTOM
+
 config LIBC_GLIBC_2_20_or_later
     bool
     select LIBC_GLIBC_2_17_or_later
@@ -149,20 +180,7 @@ config LIBC_GLIBC_2_20_or_later
 config LIBC_GLIBC_2_17_or_later
     bool
 
-config LIBC_CUSTOM
-    bool
-
-if LIBC_GLIBC_CUSTOM
-
-config LIBC_GLIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom glibc source"
-    default ""
-    help
-      Enter the path to the directory (or tarball) of your source for glibc,
-      or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/glibc
-
-endif # LIBC_GLIBC_CUSTOM
+if ! LIBC_GLIBC_CUSTOM
 
 config LIBC_VERSION
     string
@@ -187,4 +205,5 @@ config LIBC_VERSION
     default "2.10.1" if LIBC_GLIBC_V_2_10_1
     default "2.9" if LIBC_GLIBC_V_2_9
     default "2.8" if LIBC_GLIBC_V_2_8
-    default "custom" if LIBC_GLIBC_CUSTOM
+
+endif # ! LIBC_GLIBC_CUSTOM
diff --git a/config/libc/musl.in b/config/libc/musl.in
index 8df09df1..522478a8 100644
--- a/config/libc/musl.in
+++ b/config/libc/musl.in
@@ -12,6 +12,40 @@
 config THREADS
     default "musl"
 
+config LIBC_MUSL_CUSTOM
+    bool
+    prompt "Custom musl"
+    depends on EXPERIMENTAL
+    help
+      The choosen musl-libc version shall be not downloaded. Instead use
+      a custom location to get the source.
+
+if LIBC_MUSL_CUSTOM
+
+config LIBC_MUSL_CUSTOM_LOCATION
+    string
+    prompt "Full path to custom musl-libc source"
+    help
+      Enter the path to the directory or tarball of your source for musl.
+
+      If the path is a tarball, it should extract to: <name>-<version>/
+      where the name is this component, musl, and the version is set
+      below in the custom version string.
+
+config LIBC_MUSL_CUSTOM_VERSION
+    string
+    prompt "Custom MUSL version"
+    help
+      Enter the version number for your custom musl-libc.
+
+config LIBC_VERSION
+    string
+    default LIBC_MUSL_CUSTOM_VERSION
+
+endif # LIBC_MUSL_CUSTOM
+
+if ! LIBC_MUSL_CUSTOM
+
 choice
     bool
     prompt "musl version"
@@ -27,11 +61,6 @@ config LIBC_MUSL_V_1_0
     bool
     prompt "1.0.5 (Stable)"
 
-config LIBC_MUSL_V_CUSTOM
-    bool
-    prompt "Custom musl"
-    depends on EXPERIMENTAL
-
 endchoice
 
 config LIBC_VERSION
@@ -40,4 +69,5 @@ config LIBC_VERSION
 # CT_INSERT_VERSION_STRING_BELOW
     default "1.1.12" if LIBC_MUSL_V_1_1
     default "1.0.5" if LIBC_MUSL_V_1_0
-    default "custom" if LIBC_MUSL_V_CUSTOM
+
+endif # ! LIBC_MUSL_CUSTOM
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index eea89da5..40203f78 100644
--- a/config/libc/newlib.in
+++ b/config/libc/newlib.in
@@ -12,6 +12,41 @@
 ## help is only available in source form. It can be compiled for a wide
 ## help array of processors, and will usually work on any architecture with
 ## help the addition of a few low-level routines.
+#
+config LIBC_NEWLIB_CUSTOM
+    bool
+    prompt "Custom newlib"
+    depends on EXPERIMENTAL
+    select LIBC_NEWLIB_2_2_or_later
+    help
+      The choosen newlib version shall be not downloaded. Instead use
+      a custom location to get the source.
+
+if LIBC_NEWLIB_CUSTOM
+
+config LIBC_NEWLIB_CUSTOM_LOCATION
+    string
+    prompt "Full path to custom newlib source"
+    help
+      Enter the path to the directory or tarball of your source for newlib.
+
+      If the path is a tarball, it should extract to: <name>-<version>/
+      where the name is this component, newlib, and the version is set
+      below in the custom version string.
+
+config LIBC_NEWLIB_CUSTOM_VERSION
+    string
+    prompt "Custom NEWLIB version"
+    help
+      Enter the version number for your custom newlib.
+
+config LIBC_VERSION
+    string
+    default LIBC_NEWLIB_CUSTOM_VERSION
+
+endif # LIBC_NEWLIB_CUSTOM
+
+if ! LIBC_NEWLIB_CUSTOM
 
 config CC_NEWLIB_SHOW_LINARO
     bool
@@ -81,13 +116,7 @@ config LIBC_NEWLIB_V_1_17_0
 
 endchoice
 
-config LIBC_NEWLIB_CUSTOM
-    bool
-    prompt "Custom newlib"
-    depends on EXPERIMENTAL
-    help
-    The choosen library version shall be not downloaded. Instead use
-    a custom location to get the source.
+endif # ! LIBC_NEWLIB_CUSTOM
 
 config LIBC_NEWLIB_2_2
     bool
@@ -115,18 +144,7 @@ config LIBC_NEWLIB_2_0_or_later
     bool
     select LIBC_PROVIDES_CXA_ATEXIT
 
-if LIBC_NEWLIB_CUSTOM
-
-config LIBC_NEWLIB_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom newlib source"
-    default ""
-    help
-      Enter the path to the directory (or tarball) of your source for newlib,
-      or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/newlib
-
-endif # LIBC_NEWLIB_CUSTOM
-
+if ! LIBC_NEWLIB_CUSTOM
 config LIBC_VERSION
     string
 # Don't remove next line
@@ -144,6 +162,8 @@ config LIBC_VERSION
       Enter the tag you want to use.
       Leave empty to use the 'head' of the repository.
 
+endif # ! LIBC_NEWLIB_CUSTOM
+
 config LIBC_NEWLIB_TARGET_CFLAGS
     string
     prompt "Target CFLAGS for newlib"
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index 06a89751..ae26f3a2 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -20,6 +20,55 @@ comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG"
 comment "You may experience issues, although it should work just fine"
 endif # ARCH_FLOAT_SOFTFP
 
+config LIBC_UCLIBC_CUSTOM
+    bool
+    prompt "Custom uClibc"
+    depends on EXPERIMENTAL
+    help
+      The choosen uclibc version shall be not downloaded. Instead use
+      a custom location to get the source.
+
+if LIBC_UCLIBC_CUSTOM
+
+choice
+    bool
+    prompt "uClibc Version Name"
+
+config LIBC_UCLIBC_CUSTOM_UCLIBC
+    bool "uClibc"
+    select LIBC_UCLIBC_0_9_33_2_or_later
+
+config LIBC_UCLIBC_CUSTOM_UCLIBC_NG
+    bool "uClibc-ng"
+    select LIBC_UCLIBC_NG_1_0_0_or_later
+
+endchoice
+
+config LIBC_UCLIBC_CUSTOM_LOCATION
+    string
+    prompt "Full path to custom uClibc source"
+    help
+      Enter the path to the directory or tarball of your source for uClibc.
+
+      If the path is a tarball, it should extract to: <name>-<version>/
+      where the name is this component will be set by the uClibc Version Name
+      option from above, and the version is set below in the custom version
+      string.
+
+config LIBC_UCLIBC_CUSTOM_VERSION
+    string
+    prompt "Custom uClibc Version"
+    help
+      Enter the version number for your custom uClibc.
+
+config LIBC_VERSION
+    string
+    default LIBC_UCLIBC_CUSTOM_VERSION
+
+endif # LIBC_UCLIBC_CUSTOM
+
+if ! LIBC_UCLIBC_CUSTOM
+
 choice
     bool
     prompt "uClibc version"
@@ -36,26 +85,8 @@ config LIBC_UCLIBC_V_0_9_33_2
     prompt "0.9.33.2"
     select LIBC_UCLIBC_0_9_33_2_or_later
 
-config LIBC_UCLIBC_CUSTOM
-    bool
-    prompt "Custom uClibc"
-    depends on EXPERIMENTAL
-    select LIBC_UCLIBC_0_9_33_2_or_later
-
 endchoice
 
-if LIBC_UCLIBC_CUSTOM
-
-config LIBC_UCLIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom uClibc source"
-    default ""
-    help
-      Enter the path to the directory (or tarball) of your source for uClibc,
-      or leave blank to use default CT_CUSTOM_LOCATION_ROOT_DIR/uClibc
-
-endif # LIBC_UCLIBC_CUSTOM
-
 config LIBC_VERSION
     string
 # Don't remove next line
@@ -63,6 +94,8 @@ config LIBC_VERSION
     default "1.0.9" if LIBC_UCLIBC_NG_V_1_0_9
     default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2
 
+endif # ! LIBC_UCLIBC_CUSTOM
+
 config LIBC_UCLIBC_NG_1_0_9_or_later
     bool
     select LIBC_UCLIBC_NG_1_0_0_or_later