From f5d606ef7215a599e8e8b0041474bd74edffcb17 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Sat, 22 Aug 2020 13:07:14 -0400
Subject: [PATCH] Kconfig: cleanup subsystems

Sort entries alphabetically and cleanup top level menu for each
subsystem. Move stats subsystem Kconfig from debug into its own Kconfig.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 CODEOWNERS             |  1 +
 subsys/Kconfig         | 14 ++++++++------
 subsys/debug/Kconfig   | 17 -----------------
 subsys/jwt/Kconfig     |  2 +-
 subsys/stats/Kconfig   | 19 +++++++++++++++++++
 subsys/tracing/Kconfig |  2 +-
 subsys/usb/Kconfig     |  2 +-
 7 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 subsys/stats/Kconfig

diff --git a/CODEOWNERS b/CODEOWNERS
index d1758f13798..ade203e3fe4 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -496,6 +496,7 @@
 /subsys/random/                           @dleach02
 /subsys/settings/                         @nvlsianpu
 /subsys/shell/                            @jakub-uC @nordic-krch
+/subsys/stats/                            @nvlsianpu
 /subsys/storage/                          @nvlsianpu
 /subsys/testsuite/                        @nashif
 /subsys/usb/                              @jfischer-phytec-iot @finikorg
diff --git a/subsys/Kconfig b/subsys/Kconfig
index 8bd92165d17..6dc00e58577 100644
--- a/subsys/Kconfig
+++ b/subsys/Kconfig
@@ -7,6 +7,8 @@ menu "Sub Systems and OS Services"
 
 source "subsys/bluetooth/Kconfig"
 
+source "subsys/canbus/Kconfig"
+
 source "subsys/console/Kconfig"
 
 source "subsys/cpp/Kconfig"
@@ -15,8 +17,12 @@ source "subsys/debug/Kconfig"
 
 source "subsys/disk/Kconfig"
 
+source "subsys/fb/Kconfig"
+
 source "subsys/fs/Kconfig"
 
+source "subsys/jwt/Kconfig"
+
 source "subsys/logging/Kconfig"
 
 source "subsys/mgmt/Kconfig"
@@ -27,6 +33,8 @@ source "subsys/power/Kconfig"
 
 source "subsys/shell/Kconfig"
 
+source "subsys/stats/Kconfig"
+
 source "subsys/usb/Kconfig"
 
 source "subsys/dfu/Kconfig"
@@ -41,10 +49,4 @@ source "subsys/testsuite/Kconfig"
 
 source "subsys/tracing/Kconfig"
 
-source "subsys/fb/Kconfig"
-
-source "subsys/jwt/Kconfig"
-
-source "subsys/canbus/Kconfig"
-
 endmenu
diff --git a/subsys/debug/Kconfig b/subsys/debug/Kconfig
index 0aaffb729a6..7b076363743 100644
--- a/subsys/debug/Kconfig
+++ b/subsys/debug/Kconfig
@@ -12,23 +12,6 @@ config BOOT_TIME_MEASUREMENT
 	help
 	  This option enables the recording of timestamps during system boot.
 
-config STATS
-	bool "Statistics support"
-	help
-	  Enable per-module event counters for troubleshooting, maintenance,
-	  and usage monitoring.  Statistics can be retrieved with the mcumgr
-	  management subsystem.
-
-config STATS_NAMES
-	bool "Statistic names"
-	depends on STATS
-	help
-	  Include a full name string for each statistic in the build.  If this
-	  setting is disabled, statistics are assigned generic names of the
-	  form "s0", "s1", etc.  Enabling this setting simplifies debugging,
-	  but results in a larger code size.
-
-
 menuconfig THREAD_ANALYZER
 	bool "Enable Thread analyzer"
 	select INIT_STACKS
diff --git a/subsys/jwt/Kconfig b/subsys/jwt/Kconfig
index c1c10a90ff4..ac1261c6989 100644
--- a/subsys/jwt/Kconfig
+++ b/subsys/jwt/Kconfig
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig JWT
-	bool "Enable JSON Web Token generation"
+	bool "JSON Web Token generation"
 	select JSON_LIBRARY
 	help
 	  Enable creation of JWT tokens
diff --git a/subsys/stats/Kconfig b/subsys/stats/Kconfig
new file mode 100644
index 00000000000..2a9e12bdae3
--- /dev/null
+++ b/subsys/stats/Kconfig
@@ -0,0 +1,19 @@
+# Copyright (c) 2020 Intel Corp.
+# SPDX-License-Identifier: Apache-2.0
+
+
+config STATS
+	bool "Statistics support"
+	help
+	  Enable per-module event counters for troubleshooting, maintenance,
+	  and usage monitoring.  Statistics can be retrieved with the mcumgr
+	  management subsystem.
+
+config STATS_NAMES
+	bool "Statistic names"
+	depends on STATS
+	help
+	  Include a full name string for each statistic in the build.  If this
+	  setting is disabled, statistics are assigned generic names of the
+	  form "s0", "s1", etc.  Enabling this setting simplifies debugging,
+	  but results in a larger code size.
diff --git a/subsys/tracing/Kconfig b/subsys/tracing/Kconfig
index c79f4531776..0963918bd73 100644
--- a/subsys/tracing/Kconfig
+++ b/subsys/tracing/Kconfig
@@ -6,7 +6,7 @@
 DT_CHOSEN_Z_CONSOLE := zephyr,console
 
 config TRACING
-	bool "Enabling Tracing"
+	bool "Tracing Support"
 	imply THREAD_NAME
 	imply THREAD_STACK_INFO
 	imply THREAD_MONITOR
diff --git a/subsys/usb/Kconfig b/subsys/usb/Kconfig
index 1dc879b726c..7dd3affb4f1 100644
--- a/subsys/usb/Kconfig
+++ b/subsys/usb/Kconfig
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 menuconfig USB_DEVICE_STACK
-	bool "USB device stack"
+	bool "USB Device Support"
 	depends on USB_DEVICE_DRIVER || ARCH_POSIX
 	select HWINFO
 	help