runners: xsdb: Add support for optional bl31, pdi, system.dtb arguments

This update enhances the runner script to optionally accept bl31, pdi,
and system.dtb as arguments. These inputs are not mandatory and will
only be used if explicitly provided. This allows for more flexible boot
configurations, especially useful when testing different firmware and
system setups without modifying the script.

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com>

Author: Appana Durga Kedareswara rao

scripts/west_commands/runners/xsdb.py

@@ -13,7 +13,7 @@
 
 class XSDBBinaryRunner(ZephyrBinaryRunner):
     def __init__(self, cfg: RunnerConfig, config=None, bitstream=None,
-            fsbl=None):
+            fsbl=None, pdi=None, bl31=None, dtb=None):
         super().__init__(cfg)
         self.elf_file = cfg.elf_file
         if not config:
@@ -24,6 +24,9 @@ def __init__(self, cfg: RunnerConfig, config=None, bitstream=None,
         self.xsdb_cfg_file = config
         self.bitstream = bitstream
         self.fsbl = fsbl
+        self.pdi = pdi
+        self.bl31 = bl31
+        self.dtb = dtb
 
     @classmethod
     def name(cls):
@@ -38,13 +41,17 @@ def do_add_parser(cls, parser):
         parser.add_argument('--config', help='if given, override default config file')
         parser.add_argument('--bitstream', help='path to the bitstream file')
         parser.add_argument('--fsbl', help='path to the fsbl elf file')
+        parser.add_argument('--pdi', help='path to the base/boot pdi file')
+        parser.add_argument('--bl31', help='path to the bl31(ATF) elf file')
+        parser.add_argument('--system-dtb', help='path to the system.dtb file')
 
     @classmethod
     def do_create(
         cls, cfg: RunnerConfig, args: argparse.Namespace
     ) -> "XSDBBinaryRunner":
         return XSDBBinaryRunner(cfg, config=args.config,
-                bitstream=args.bitstream, fsbl=args.fsbl)
+                bitstream=args.bitstream, fsbl=args.fsbl,
+                pdi=args.pdi, bl31=args.bl31, dtb=args.system_dtb)
 
     def do_run(self, command, **kwargs):
         if self.bitstream and self.fsbl:
@@ -53,6 +60,12 @@ def do_run(self, command, **kwargs):
             cmd = ['xsdb', self.xsdb_cfg_file, self.elf_file, self.bitstream]
         elif self.fsbl:
             cmd = ['xsdb', self.xsdb_cfg_file, self.elf_file, self.fsbl]
+        elif self.pdi and self.bl31 and self.dtb:
+            cmd = ['xsdb', self.xsdb_cfg_file, self.elf_file, self.pdi, self.bl31, self.dtb]
+        elif self.pdi and self.bl31:
+            cmd = ['xsdb', self.xsdb_cfg_file, self.elf_file, self.pdi, self.bl31]
+        elif self.pdi:
+            cmd = ['xsdb', self.xsdb_cfg_file, self.elf_file, self.pdi]
         else:
             cmd = ['xsdb', self.xsdb_cfg_file, self.elf_file]
         self.check_call(cmd)

scripts/west_commands/tests/test_xsdb.py

@@ -13,32 +13,81 @@
         "config": None,
         "bitstream": None,
         "fsbl": None,
+        "pdi": None,
+        "bl31": None,
+        "dtb": None,
         "expected_cmd": ["xsdb", "default_cfg_path", RC_KERNEL_ELF],
     },
     {
         "config": "custom_cfg_path",
         "bitstream": None,
         "fsbl": None,
+        "pdi": None,
+        "bl31": None,
+        "dtb": None,
         "expected_cmd": ["xsdb", "custom_cfg_path", RC_KERNEL_ELF],
     },
     {
         "config": None,
         "bitstream": "bitstream_path",
         "fsbl": None,
+        "pdi": None,
+        "bl31": None,
+        "dtb": None,
         "expected_cmd": ["xsdb", "default_cfg_path", RC_KERNEL_ELF, "bitstream_path"],
     },
     {
         "config": None,
         "bitstream": None,
         "fsbl": "fsbl_path",
+        "pdi": None,
+        "bl31": None,
+        "dtb": None,
         "expected_cmd": ["xsdb", "default_cfg_path", RC_KERNEL_ELF, "fsbl_path"],
     },
     {
         "config": None,
         "bitstream": "bitstream_path",
         "fsbl": "fsbl_path",
+        "pdi": None,
+        "bl31": None,
+        "dtb": None,
         "expected_cmd": ["xsdb", "default_cfg_path", RC_KERNEL_ELF, "bitstream_path", "fsbl_path"],
     },
+    {
+        "config": None,
+        "bitstream": None,
+        "fsbl": None,
+        "pdi": "pdi_path",
+        "bl31": None,
+        "dtb": None,
+        "expected_cmd": ["xsdb", "default_cfg_path", RC_KERNEL_ELF, "pdi_path"],
+    },
+    {
+        "config": None,
+        "bitstream": None,
+        "fsbl": None,
+        "pdi": "pdi_path",
+        "bl31": "bl31_path",
+        "dtb": None,
+        "expected_cmd": ["xsdb", "default_cfg_path", RC_KERNEL_ELF, "pdi_path", "bl31_path"],
+    },
+    {
+        "config": None,
+        "bitstream": None,
+        "fsbl": None,
+        "pdi": "pdi_path",
+        "bl31": "bl31_path",
+        "dtb": "dtb_path",
+        "expected_cmd": [
+            "xsdb",
+            "default_cfg_path",
+            RC_KERNEL_ELF,
+            "pdi_path",
+            "bl31_path",
+            "dtb_path",
+        ],
+    },
 ]
 
 
@@ -54,6 +103,9 @@ def test_xsdbbinaryrunner_init(check_call, path_exists, tc, runner_config):
             config=tc["config"],
             bitstream=tc["bitstream"],
             fsbl=tc["fsbl"],
+            pdi=tc["pdi"],
+            bl31=tc["bl31"],
+            dtb=tc["dtb"],
         )
 
     runner.do_run("flash")
@@ -73,6 +125,12 @@ def test_xsdbbinaryrunner_create(check_call, path_exists, tc, runner_config):
         args.extend(["--bitstream", tc["bitstream"]])
     if tc["fsbl"]:
         args.extend(["--fsbl", tc["fsbl"]])
+    if tc["pdi"]:
+        args.extend(["--pdi", tc["pdi"]])
+    if tc["bl31"]:
+        args.extend(["--bl31", tc["bl31"]])
+    if tc["dtb"]:
+        args.extend(["--system-dtb", tc["dtb"]])
 
     parser = argparse.ArgumentParser(allow_abbrev=False)
     XSDBBinaryRunner.add_parser(parser)