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/kernel/linux.in | 50 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 15 deletions(-)

(limited to 'config/kernel')

diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index 5b429ecb..26699516 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -5,6 +5,39 @@
 ##
 ## help Build a toolchain targeting systems running Linux as a kernel.
 
+config KERNEL_LINUX_CUSTOM
+    bool
+    prompt "custom tarball or directory"
+    help
+      The choosen linux version shall be not downloaded. Instead use
+      a custom location to get the source.
+
+if KERNEL_LINUX_CUSTOM
+
+config KERNEL_LINUX_CUSTOM_LOCATION
+    string
+    prompt "Path to custom source, tarball or directory"
+    help
+      Enter the path to the directory or tarball of your source for linux.
+
+      If the path is a tarball, it should extract to: <name>-<version>/
+      where the name is this component, linux, and the version is set
+      below in the custom version string.
+
+config KERNEL_LINUX_CUSTOM_VERSION
+    string
+    prompt "Custom Linux version"
+    help
+      Enter the version number for your custom linux.
+
+config KERNEL_VERSION
+    string
+    default KERNEL_LINUX_CUSTOM_VERSION
+
+endif # KERNEL_LINUX_CUSTOM
+
+if ! KERNEL_LINUX_CUSTOM
+
 choice
     bool
     prompt "Linux kernel version"
@@ -52,20 +85,6 @@ config KERNEL_V_2_6_32
     prompt "2.6.32.68"
     help
  
-config KERNEL_LINUX_CUSTOM
-    bool
-    prompt "custom tarball or directory"
-    help
-      Use a local tarball or local kernel directory of a complete kernel source tree.
-
-config KERNEL_LINUX_CUSTOM_LOCATION
-    string
-    prompt "Path to custom source, tarball or directory"
-    depends on KERNEL_LINUX_CUSTOM
-    help
-      Enter here the path to the tarball of your full kernel tree or
-      kernel directory
-
 endchoice
 
 config KERNEL_VERSION
@@ -82,4 +101,5 @@ config KERNEL_VERSION
     default "3.4.110" if KERNEL_V_3_4
     default "3.2.72" if KERNEL_V_3_2
     default "2.6.32.68" if KERNEL_V_2_6_32
-    default "custom" if KERNEL_LINUX_CUSTOM
+
+endif # ! KERNEL_LINUX_CUSTOM
-- 
cgit v1.2.3