west_commands: lopper_command: Align with latest lopper changes

Include additnal lops execution as per recent changes related
to mbv32 device tree generation in lopper.

Existing logic copies lopper generated artifacts to workspace
directory provided by user (-w option). User needs to copy those
files to appropriate directories in zephyr repository manually.

Ideally dts and kconfig generated by lopper_command supposed
to be copied to zephyr repository targeted by user. It avoids
manual work.

dts destination path : <zephyr repo path>/boards/amd/mbv32/
Kconfig destination path: <zephyr repo path>/soc/xlnx/mbv32/

Treat -w argument passed by user as zephyr repository path and
copy dts and kconfigs to appropriate locations.

Signed-off-by: Mubin Sayyed <[email protected]>
Message-ID: <[email protected]>
State: pending

Author: mubinsyed2

scripts/west_commands/lopper_command.py

@@ -6,6 +6,7 @@
 import sys
 import lopper
 import os
+import shutil
 from west.commands import WestCommand
 
 def get_dir_path(fpath):
@@ -70,8 +71,8 @@ def do_add_parser(self, parser_adder):
             "-w",
             "--ws_dir",
             action="store",
-            help="Workspace directory where domain will be created (Default: Current Work Directory)",
-            default='.',
+            help="Workspace directory (zephyr repository path) where domain will be created (Default: zephyr directory in Current Work Directory)",
+            default='./zephyr/',
         )
 
         return parser
@@ -80,12 +81,29 @@ def do_run(self, args, unknown_args):
         sdt = os.path.abspath(args.sdt)
         proc = args.proc
         workspace = os.path.abspath(args.ws_dir)
+        workspace = os.path.join(os.path.abspath(args.ws_dir), "lopper_metadata")
+        if not os.path.exists(workspace):
+            os.makedirs(workspace)
+        generated_dts_file = os.path.join(workspace, "mbv32.dts")
+        workspace_dts_file = os.path.join(os.path.abspath(args.ws_dir), "boards", "amd", "mbv32", "mbv32.dts")
+        workspace_kconfig_defconfig = os.path.join(os.path.abspath(args.ws_dir), "soc", "xlnx", "mbv32", "Kconfig.defconfig")
+        generated_kconfig_defconfig = os.path.join(workspace, "Kconfig.defconfig")
+        workspace_kconfig_soc = os.path.join(os.path.abspath(args.ws_dir), "soc", "xlnx", "mbv32", "Kconfig")
+        generated_kconfig_soc = os.path.join(workspace, "Kconfig")
         lops_dir = os.path.join(get_dir_path(lopper.__file__), "lops")
 
 
         lops_file = os.path.join(lops_dir, "lop-microblaze-riscv.dts")
+        lops_file_intc = os.path.join(lops_dir, "lop-mbv-zephyr-intc.dts")
         runcmd(f"lopper -f --enhanced -O {workspace} -i {lops_file} {sdt} {workspace}/system-domain.dts -- gen_domain_dts microblaze_riscv_0",
                 cwd = workspace)
         runcmd(f"lopper -f --enhanced -O {workspace} -i {lops_file} {workspace}/system-domain.dts {workspace}/system-zephyr.dts -- gen_domain_dts microblaze_riscv_0 zephyr_dt",
                 cwd = workspace)
+        runcmd(f"lopper -f --enhanced -O {workspace} -i {lops_file_intc}  {workspace}/system-zephyr.dts  {workspace}/mbv32.dts",
+                 cwd = workspace)
+
+        shutil.copy(generated_dts_file, workspace_dts_file)
+        shutil.copy(generated_kconfig_defconfig, workspace_kconfig_defconfig)
+        shutil.copy(generated_kconfig_soc, workspace_kconfig_soc)
+        shutil.rmtree(workspace)