From 8017c59cb0bb88bc5962817ef7e2eea88e882141 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Thu, 23 May 2019 17:19:41 -0400
Subject: [PATCH] modules: move module kconfig to main tree

Due to in-tree dependencies on Kconfig options defined in modules we end
up having warnings and errors when those modules are not part of the
manifest.

Users should be able to remove unwanted modules from their downstream
manifest and still build any board configurations.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
---
 CODEOWNERS               |  1 +
 Kconfig.zephyr           |  2 ++
 modules/Kconfig          |  8 ++++++
 modules/Kconfig.qmsi     | 20 +++++++++++++
 modules/Kconfig.tinycbor | 61 ++++++++++++++++++++++++++++++++++++++++
 5 files changed, 92 insertions(+)
 create mode 100644 modules/Kconfig
 create mode 100644 modules/Kconfig.qmsi
 create mode 100644 modules/Kconfig.tinycbor

diff --git a/CODEOWNERS b/CODEOWNERS
index 61ae2e88187..4422db74a5d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -262,6 +262,7 @@
 /lib/cmsis_rtos_v2/                       @nashif
 /lib/cmsis_rtos_v1/                       @nashif
 /lib/libc/                                @nashif @andrewboie
+/modules/                                 @nashif
 /kernel/device.c                          @andrewboie @andyross @nashif
 /kernel/idle.c                            @andrewboie @andyross @nashif
 /samples/                                 @nashif
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index 749b8204182..6771bb1cb8c 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -10,6 +10,7 @@
 menu "Modules"
 
 source "$(CMAKE_BINARY_DIR)/Kconfig.modules"
+source "modules/Kconfig"
 
 endmenu
 
@@ -44,6 +45,7 @@ source "subsys/Kconfig"
 
 source "ext/Kconfig"
 
+
 menu "Build and Link Features"
 
 menu "Linker Options"
diff --git a/modules/Kconfig b/modules/Kconfig
new file mode 100644
index 00000000000..006dc9701e7
--- /dev/null
+++ b/modules/Kconfig
@@ -0,0 +1,8 @@
+
+# Copyright (c) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+comment "Optional modules. Make sure they're installed, via the project manifest."
+
+osource "modules/Kconfig.*"
diff --git a/modules/Kconfig.qmsi b/modules/Kconfig.qmsi
new file mode 100644
index 00000000000..92c20caf57a
--- /dev/null
+++ b/modules/Kconfig.qmsi
@@ -0,0 +1,20 @@
+# Kconfig - QMSI drivers configuration options
+
+#
+# Copyright (c) 2015 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+menu "QMSI"
+
+config HAS_QMSI
+	bool
+
+config QMSI
+	bool "QMSI driver support"
+	depends on HAS_QMSI
+	help
+	  Enable QMSI driver support.
+
+endmenu
diff --git a/modules/Kconfig.tinycbor b/modules/Kconfig.tinycbor
new file mode 100644
index 00000000000..4aa8a200a38
--- /dev/null
+++ b/modules/Kconfig.tinycbor
@@ -0,0 +1,61 @@
+# Copyright (c) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config TINYCBOR
+	bool "tinyCBOR Support"
+	help
+	  This option enables the tinyCBOR library.
+
+if TINYCBOR
+
+config CBOR_NO_DFLT_WRITER
+	bool "No default writer support"
+	help
+	  This option specifies whether a default writer exists.
+
+config CBOR_NO_DFLT_READER
+	bool "No default reader support"
+	help
+	  This option specifies whether a default reader exists.
+
+config CBOR_ENCODER_NO_CHECK_USER
+	bool "No encoder checks for user args for validity"
+	help
+	  This option specifies whether a check user exists for a cbor encoder.
+
+config CBOR_PARSER_MAX_RECURSIONS
+	int "Parser max recursions"
+	default 1024
+	help
+	  This option specifies max recursions for the parser.
+
+config CBOR_PARSER_NO_STRICT_CHECKS
+	bool "No strict parser checks"
+	help
+	  This option enables the strict parser checks.
+
+config CBOR_FLOATING_POINT
+	bool "Floating point support"
+	select NEWLIB_LIBC
+	help
+	  This option enables floating point support.
+
+config CBOR_HALF_FLOAT_TYPE
+	bool "Half float type support"
+	select NEWLIB_LIBC
+	help
+	  This option enables half float type support.
+
+config CBOR_WITHOUT_OPEN_MEMSTREAM
+	bool "Without open memstream"
+	default y
+	help
+	  This option enables open memstream support.
+
+config CBOR_PRETTY_PRINTING
+	bool "Implement pretty printing functionality"
+	help
+	  This option enables cbor_value_to_pretty_stream function.
+
+endif #TINYCBOR