sys/riotconf: add root configuration backend

drivers/include/mtd_default.h

@@ -33,6 +33,10 @@ extern "C" {
 #include "mtd_emulated.h"
 #endif
 
+#if defined(MODULE_MTD_FLASHPAGE)
+#include "mtd_flashpage.h"
+#endif
+
 #if defined(MODULE_MTD_SDCARD_DEFAULT)
 extern mtd_sdcard_t mtd_sdcard_dev0;
 #endif

makefiles/pseudomodules.inc.mk

@@ -609,6 +609,7 @@ PSEUDOMODULES += test_utils_main_exit_cb
 # All auto_init modules are pseudomodules
 PSEUDOMODULES += auto_init_%
 NO_PSEUDOMODULES += auto_init_can
+NO_PSEUDOMODULES += auto_init_configuration
 NO_PSEUDOMODULES += auto_init_loramac
 NO_PSEUDOMODULES += auto_init_multimedia
 NO_PSEUDOMODULES += auto_init_security

sys/Kconfig

@@ -8,6 +8,10 @@ menu "System"
 
 rsource "auto_init/Kconfig"
 rsource "chunked_ringbuffer/Kconfig"
+rsource "clif/Kconfig"
+rsource "color/Kconfig"
+rsource "configuration/Kconfig"
+rsource "crypto/Kconfig"
 rsource "congure/Kconfig"
 rsource "debug_irq_disable/Kconfig"
 rsource "entropy_source/Kconfig"

sys/Makefile

@@ -17,6 +17,9 @@ endif
 ifneq (,$(filter telnet,$(USEMODULE)))
   DIRS += net/application_layer/telnet
 endif
+ifneq (,$(filter configuration,$(USEMODULE)))
+  DIRS += configuration
+endif
 ifneq (,$(filter constfs,$(USEMODULE)))
   DIRS += fs/constfs
 endif

sys/Makefile.dep

@@ -705,4 +705,8 @@ ifneq (,$(filter wifi_scan_list,$(USEMODULE)))
   USEMODULE += l2scan_list
 endif
 
+ifneq (,$(filter configuration configuration_%,$(USEMODULE)))
+  include $(RIOTBASE)/sys/configuration/Makefile.dep
+endif
+
 include $(RIOTBASE)/sys/test_utils/Makefile.dep

sys/Makefile.include

@@ -117,6 +117,10 @@ ifneq (,$(filter riotboot,$(FEATURES_USED)))
   include $(RIOTBASE)/sys/riotboot/Makefile.include
 endif
 
+ifneq (,$(filter riotconf,$(USEMODULE)))
+  include $(RIOTBASE)/sys/riotconf/Makefile.include
+endif
+
 ifneq (,$(filter skald, $(USEMODULE)))
   include $(RIOTBASE)/sys/net/ble/skald/Makefile.include
 endif
@@ -199,3 +203,7 @@ endif
 ifneq (,$(filter nanocoap,$(USEMODULE)))
   include $(RIOTBASE)/sys/net/application_layer/nanocoap/Makefile.include
 endif
+
+ifneq (,$(filter configuration configuration_%,$(USEMODULE)))
+  include $(RIOTBASE)/sys/configuration/Makefile.include
+endif

sys/auto_init/Makefile

@@ -10,6 +10,10 @@ ifneq (,$(filter auto_init_can,$(USEMODULE)))
   DIRS += can
 endif
 
+ifneq (,$(filter auto_init_configuration,$(USEMODULE)))
+  DIRS += configuration
+endif
+
 ifneq (,$(filter auto_init_loramac,$(USEMODULE)))
   DIRS += loramac
 endif

sys/auto_init/auto_init.c

@@ -27,19 +27,8 @@
 #include "auto_init_priorities.h"
 #include "kernel_defines.h"
 
-#define ENABLE_DEBUG CONFIG_AUTO_INIT_ENABLE_DEBUG
-#include "debug.h"
-
 XFA_INIT_CONST(auto_init_module_t, auto_init_xfa);
 
-static inline void _auto_init_module(const volatile auto_init_module_t *module)
-{
-#if IS_ACTIVE(CONFIG_AUTO_INIT_ENABLE_DEBUG)
-    DEBUG("auto_init: %s (%u)\n", module->name, module->prio);
-#endif
-    module->init();
-}
-
 #if IS_USED(MODULE_AUTO_INIT_ZTIMER)
 extern void ztimer_init(void);
 AUTO_INIT(ztimer_init,
@@ -174,6 +163,11 @@ extern void auto_init_vfs(void);
 AUTO_INIT(auto_init_vfs,
           AUTO_INIT_PRIO_MOD_VFS);
 #endif
+#if IS_USED(MODULE_CONFIGURATION)
+extern void auto_init_configuration(void);
+AUTO_INIT(auto_init_configuration,
+          AUTO_INIT_PRIO_MOD_CONFIGURATION);
+#endif
 #if IS_USED(MODULE_AUTO_INIT_GNRC_IPV6_NIB)
 extern void gnrc_ipv6_nib_init(void);
 AUTO_INIT(gnrc_ipv6_nib_init,
@@ -348,6 +342,6 @@ AUTO_INIT(auto_init_gnrc_ipv6_static_addr,
 void auto_init(void)
 {
     for (unsigned i = 0; i < XFA_LEN(auto_init_module_t, auto_init_xfa); i++) {
-        _auto_init_module(&auto_init_xfa[i]);
+        auto_init_module(&auto_init_xfa[i]);
     }
 }

sys/auto_init/configuration/Makefile

@@ -0,0 +1,3 @@
+MODULE = auto_init_configuration
+
+include $(RIOTBASE)/Makefile.base

sys/auto_init/configuration/auto_init_configuration.c

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023 ML!PA Consulting GmbH
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ *
+ */
+
+/**
+ * @ingroup     sys_auto_init_configuration
+ * @{
+ *
+ * @file
+ * @brief       Auto initialization for configuration subsystems
+ *
+ * @author      Fabian Hüßler <[email protected]>
+ *
+ * @}
+ */
+
+#ifdef MODULE_CONFIGURATION
+
+#include "auto_init_utils.h"
+#include "configuration.h"
+#if IS_USED(MODULE_RIOTCONF)
+#include "configuration_backend_riotconf.h"
+#endif
+
+XFA_INIT_CONST(auto_init_module_t, auto_init_configuration_xfa);
+
+#ifndef CONFIG_CONFIGURATION_ROOT_BACKEND_OPS
+#if IS_USED(MODULE_RIOTCONF)
+#define CONFIG_CONFIGURATION_ROOT_BACKEND_OPS &conf_backend_riotconf_ops
+#else
+#define CONFIG_CONFIGURATION_ROOT_BACKEND_OPS NULL
+#endif
+#endif
+
+static const CONF_BACKEND(_root_backend,
+                          CONFIG_CONFIGURATION_ROOT_BACKEND_OPS,
+                          CONF_FMT_CBOR);
+
+__attribute__((weak))
+void auto_init_configuration_root_backend_init(void)
+{
+    *configuration_get_src_backend(configuration_get_root()) = &_root_backend;
+    *configuration_get_dst_backend(configuration_get_root()) = &_root_backend;
+}
+
+void auto_init_configuration(void)
+{
+    for (unsigned i = 0; i < XFA_LEN(auto_init_module_t, auto_init_configuration_xfa); i++) {
+        auto_init_module(&auto_init_configuration_xfa[i]);
+    }
+    auto_init_configuration_root_backend_init();
+}
+
+#else
+typedef int dont_be_pedantic;
+#endif /* MODULE_CONFIGURATION */

sys/auto_init/include/auto_init_priorities.h

@@ -197,6 +197,12 @@ extern "C" {
  */
 #define AUTO_INIT_PRIO_MOD_VFS                          1260
 #endif
+#ifndef AUTO_INIT_PRIO_MOD_CONFIGURATION
+/**
+ * @brief   Configuration priority
+ */
+#define AUTO_INIT_PRIO_MOD_CONFIGURATION                1265
+#endif
 #ifndef AUTO_INIT_PRIO_MOD_GNRC_IPV6_NIB
 /**
  * @brief   GNRC IPv6 NIB priority

sys/configuration/Kconfig

@@ -0,0 +1,18 @@
+# Copyright (c) 2023 ML!PA Consulting GmbH
+#
+# This file is subject to the terms and conditions of the GNU Lesser
+# General Public License v2.1. See the file LICENSE in the top level
+# directory for more details.
+#
+
+menuconfig MODULE_CONFIGURATION
+    bool "Runtime Configuration Module"
+    help
+        Backend agnostic runtime configuration module.
+
+if MODULE_CONFIGURATION
+
+config CONFIGURATION_DEPTH_MAX
+    int "Maximum number of nested configuration items"
+
+endif # MODULE_CONFIGURATION

sys/configuration/Makefile

@@ -0,0 +1,11 @@
+MODULE := configuration
+
+SUBMODULES := 1
+
+SRC := configuration.c default_handlers.c
+
+ifneq (,$(filter configuration_backend_%,$(USEMODULE)))
+  DIRS += backend
+endif
+
+include $(RIOTBASE)/Makefile.base

sys/configuration/Makefile.dep

@@ -0,0 +1,42 @@
+DEFAULT_MODULE += auto_init_configuration
+
+USEMODULE += fmt
+
+ifneq (,$(filter configuration_backend_%,$(USEMODULE)))
+  USEMODULE += configuration_backend
+endif
+
+ifneq (,$(filter configuration_backend_riotconf,$(USEMODULE)))
+  USEMODULE += riotconf
+endif
+
+ifneq (,$(filter configuration_backend_flashdb%,$(USEMODULE)))
+  # this backend needs strings
+  USEMODULE += configuration_strings
+  USEMODULE += configuration_backend_flashdb
+  USEMODULE += flashdb_kvdb
+  ifneq (,$(filter configuration_backend_flashdb_mtd,$(USEMODULE)))
+    USEMODULE += flashdb_mtd
+  endif
+endif
+
+ifneq (,$(filter configuration_strings,$(USEMODULE)))
+  USEMODULE += configuration_handler_parent
+endif
+
+ifneq (,$(filter configuration_delta_encoding,$(USEMODULE)))
+  USEMODULE += configuration_handler_parent
+endif
+
+ifneq (,$(filter configuration_delta_decoding,$(USEMODULE)))
+  USEMODULE += configuration_handler_parent
+endif
+
+ifneq (,$(filter configuration_delta_encoding_decoding,$(USEMODULE)))
+  USEMODULE += configuration_delta_encoding
+  USEMODULE += configuration_delta_decoding
+endif
+
+ifneq (,$(filter configuration_key_subkey,$(USEMODULE)))
+  USEMODULE += configuration_handler_parent
+endif

sys/configuration/Makefile.include

@@ -0,0 +1,29 @@
+USEMODULE_INCLUDES_configuration := $(LAST_MAKEFILEDIR)/include
+USEMODULE_INCLUDES += $(USEMODULE_INCLUDES_configuration)
+
+# any backend pseudo module
+PSEUDOMODULES += configuration_backend_%
+
+# Store a parent reference in the configuration handler
+PSEUDOMODULES += configuration_handler_parent
+
+# use if you want to use custom handlers for import, export, delete, encode, decode
+PSEUDOMODULES += configuration_custom_operations
+
+# use if source backend is unequal to destination backend
+PSEUDOMODULES += configuration_destination_backend
+
+# use if you want to construct a string path for a configuration item
+PSEUDOMODULES += configuration_strings
+
+# encode SIDs relative to their parent SID (delta encoding)
+PSEUDOMODULES += configuration_delta_encoding
+
+# decode SIDs relative to their parent SID (delta decoding)
+PSEUDOMODULES += configuration_delta_decoding
+
+# alias for configuration_delta_encoding and configuration_delta_decoding
+PSEUDOMODULES += configuration_delta_encoding_decoding
+
+# be able to export sub items which don't have a backend configured
+PSEUDOMODULES += configuration_key_subkey

sys/configuration/backend/Makefile

@@ -0,0 +1,5 @@
+MODULE := configuration_backend
+SUBMODULES := 1
+BASE_MODULE := configuration_backend
+
+include $(RIOTBASE)/Makefile.base