Populate Device and Pack information from cbuild-run

pyocd/board/board.py

@@ -110,7 +110,8 @@ def __init__(self,
 
         # Create target from cbuild-run information.
         if cbuild_run and cbuild_run.target:
-            cbuild_run.populate_target(target)
+            # cbuild_run.populate_target(target)
+            pack_target.PackTargets.populate_targets_from_pack(cbuild_run.device_pack)
 
         # Create targets from provided CMSIS pack.
         if session.options['pack'] is not None:

pyocd/target/pack/cbuild_run.py

@@ -16,6 +16,7 @@
 
 import logging
 import yaml
+import os
 
 from .. import (normalise_target_type_name, TARGET)
 from ...coresight.coresight_target import CoreSightTarget
@@ -52,6 +53,19 @@ def target(self) -> str:
         else:
             return ''
 
+    @property
+    def device_pack(self) -> list:
+        """@brief Device Pack (DFP).
+        @return Value of 'device-pack'.
+        """
+        if self._valid and ('device-pack' in self._data['cbuild-run']):
+            vendor, _pack = self._data['cbuild-run']['device-pack'].split('::', 1)
+            name, version = _pack.split('@', 1)
+            pack = f"${{CMSIS_PACK_ROOT}}/{vendor}/{name}/{version}"
+            return [os.path.expandvars(pack)]
+        else:
+            return []
+
     def populate_target(self, target: str) -> None:
         """@brief Generates and populates the target defined by the .cbuild-run.yml file.
         @param self This object.