snippets: allow to use Kconfig files

This is a draft and have some limitations, WiP.

Signed-off-by: Johann Fischer <[email protected]>

Author: jfischer-no

Kconfig.zephyr

@@ -28,6 +28,9 @@ osource "$(KCONFIG_BOARD_DIR)/Kconfig.defconfig"
 # This loads Zephyr specific SoC root defconfigs
 source "$(KCONFIG_BINARY_DIR)/soc/Kconfig.defconfig"
 
+# This loads snippets Kconfigs
+osource "$(KCONFIG_BINARY_DIR)/snippets/Kconfig"
+
 # This loads the toolchain defconfigs
 osource "$(TOOLCHAIN_KCONFIG_DIR)/Kconfig.defconfig"
 # This loads the testsuite defconfig

cmake/modules/snippets.cmake

@@ -100,6 +100,11 @@ function(zephyr_process_snippets)
     OUTPUT_VARIABLE snippets_target_cmd)
   add_custom_target(snippets ${snippets_target_cmd} USES_TERMINAL)
 
+  # Generate snippets Kconfig file.
+  if (kconfig_snippets)
+    kconfig_gen("snippets" "Kconfig" "${kconfig_snippets}" "Zephyr snippets Kconfig files")
+  endif()
+
   # If snippets were requested, print messages for each one.
   if(SNIPPET_AS_LIST)
     # Print the requested snippets.

scripts/schemas/snippet-schema.yml

@@ -13,6 +13,10 @@ schema;append-schema:
       type: str
     EXTRA_CONF_FILE:
       type: str
+    cmake:
+      type: str
+    kconfig:
+      type: str
     DTS_EXTRA_CPPFLAGS:
       type: str
 

scripts/snippets.py

@@ -52,13 +52,25 @@ def process_data(self, pathobj: Path, snippet_data: dict):
         '''Process the data in a snippet.yml file, after it is loaded into a
         python object and validated by pykwalify.'''
         def append_value(variable, value):
-            if variable in ('EXTRA_DTC_OVERLAY_FILE', 'EXTRA_CONF_FILE'):
+            if variable in ('EXTRA_DTC_OVERLAY_FILE', 'EXTRA_CONF_FILE', 'kconfig'):
                 path = pathobj.parent / value
                 if not path.is_file():
                     _err(f'snippet file {pathobj}: {variable}: file not found: {path}')
+                if variable == 'kconfig':
+                    basename = os.path.basename(path)
+                    dirname = os.path.dirname(path)
+                    if basename != 'Kconfig':
+                        _err(f'snippet file {pathobj} is not a Kconfig')
+                    return f'"{path.parent.as_posix()}"'
                 return f'"{path.as_posix()}"'
             if variable in ('DTS_EXTRA_CPPFLAGS'):
                 return f'"{value}"'
+            if variable in ('cmake'):
+                cmake_file = os.path.join(pathobj.parent, value, "CMakeLists.txt")
+                if not os.path.isfile(cmake_file):
+                    _err(f'snippet file {pathobj} file not found: {cmake_file}')
+                cmake_path = os.path.join(pathobj.parent, value)
+                return Path(cmake_path).resolve().as_posix()
             _err(f'unknown append variable: {variable}')
 
         for variable, value in snippet_data.get('append', {}).items():
@@ -170,9 +182,15 @@ def print_appends_for_board(self, board: str, appends: Appends):
     def print_appends(self, appends: Appends, indent: int):
         space = '  ' * indent
         for name, values in appends.items():
-            for value in values:
-                self.print(f'{space}zephyr_set({name} {value} SCOPE snippets APPEND)')
-
+            if name in ('kconfig'):
+                for value in values:
+                    self.print(f'list(APPEND kconfig_snippets {value})')
+            elif name in ('cmake'):
+                for value in values:
+                    self.print(f'#Fixme: {value})')
+            else:
+                for value in values:
+                    self.print(f'{space}zephyr_set({name} {value} SCOPE snippets APPEND)')
     def print(self, *args, **kwargs):
         kwargs['file'] = self.out_file
         print(*args, **kwargs)