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>

1 files changed, 39 insertions, 19 deletions

diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index eea89da..40203f7 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"