rimage: add TOML preprocessing

TOML configuration files for rimage are composed of multiple logical blocks, and those blocks are repeated between multiple configuration files. We use the C preprocessor to merge those blocks, to substitude any parameter values and to perform condition checking. Signed-off-by: Guennadi Liakhovetski <[email protected]>
zephyrproject-rtos · Nov 17, 2023 · b3af0f9 · b3af0f9
1 parent f25e220
commit b3af0f9
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/scripts/west_commands/sign.py b/scripts/west_commands/sign.py
@@ -481,7 +481,7 @@ def sign(self, command, build_dir, build_conf, formats):
 
         #### -c sof/rimage/config/signing_schema.toml  ####
 
-        cmake_toml = target + '.toml'
+        cmake_toml = target + '.toml.h'
 
         if not args.quiet:
             log.inf('Signing with tool {}'.format(tool_path))
@@ -504,7 +504,16 @@ def sign(self, command, build_dir, build_conf, formats):
         else:
             conf_dir = sof_src_dir / 'tools' / 'rimage' / 'config'
 
-        conf_path_cmd = ['-c', str(conf_dir / cmake_toml)] if conf_dir else []
+        if conf_dir:
+            pre_toml = target + '.toml'
+            output_toml = str(b / 'zephyr' / pre_toml)
+            compiler_path = cache.get("CMAKE_C_COMPILER", "")
+            preproc_cmd = [compiler_path] + ['-E', str(conf_dir / cmake_toml)] + ['-o', output_toml]
+            log.inf('Calling preprocessor\n' + quote_sh_list(preproc_cmd))
+            subprocess.check_call(preproc_cmd)
+            conf_path_cmd = ['-c', output_toml]
+        else:
+            conf_path_cmd = []
 
         log.inf('Signing for SOC target ' + target)