cbuild-run: add device-settings node processing

Author: TeoMahnic

pyocd/target/pack/cbuild_run.py

@@ -1211,6 +1211,7 @@ def __init__(self, device: CbuildRun) -> None:
 
         self._debugvars: Optional[Block] = None
         self._debugvars_conf: Optional[Block] = None
+        self._device_settings: Optional[Block] = None
         self._sequences: Set[DebugSequence] = set()
 
     @property
@@ -1232,6 +1233,15 @@ def dbgconf_variables(self) -> Optional[Block]:
             self._debugvars_conf = self._dbgconf_variables(dbgconf_file)
         return self._debugvars_conf
 
+    @property
+    def device_settings(self) -> Optional[Block]:
+        if self._device_settings is None:
+            _device_settings = self._cbuild_debugger.get('device-settings') or {}
+            settings = "".join(f"{key} = {value};\n" for key, value in _device_settings.items())
+            if settings:
+                self._device_settings = Block(settings, info='device-settings')
+        return self._device_settings
+
     @property
     def sequences(self) -> Set[DebugSequence]:
         if not self._sequences:
@@ -1320,11 +1330,18 @@ def get_root_scope(self, context: DebugSequenceExecutionContext) -> Scope:
             with context.push(debugvars_block, self._debugvars):
                 debugvars_block.execute(context)
 
-        # Override default debugvars with values from *.dbgconf file.
-        debugvars_conf_block = self._cbuild_sequences.dbgconf_variables
-        if debugvars_conf_block is not None:
-            with context.push(debugvars_conf_block, self._debugvars):
-                debugvars_conf_block.execute(context)
+        # if `device-settings:` is present then an also specified `*.dbgconf` file is ignored.
+        device_settings_block = self._cbuild_sequences.device_settings
+        if device_settings_block is not None:
+            # Override debugvars with values from the 'device-settings' node in *.cbuild-run.yml
+            with context.push(device_settings_block, self._debugvars):
+                device_settings_block.execute(context)
+        else:
+            # Override default debugvars with values from *.dbgconf file.
+            debugvars_conf_block = self._cbuild_sequences.dbgconf_variables
+            if debugvars_conf_block is not None:
+                with context.push(debugvars_conf_block, self._debugvars):
+                    debugvars_conf_block.execute(context)
 
         # Make all vars read-only.
         self._debugvars.freeze()