lopper: assists: zephyr: Updates for mbv zephyr

--> Add support for zephyr,shell-uart property generation. --> Remove unused properties from cpu node. Signed-off-by: Appana Durga Kedareswara rao <[email protected]>
devicetree-org · Mar 5, 2025 · 892fcc3 · 892fcc3
1 parent 0797ae7
commit 892fcc3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/lopper/assists/gen_domain_dts.py b/lopper/assists/gen_domain_dts.py
@@ -340,6 +340,13 @@ def xlnx_generate_domain_dts(tgt_node, sdt, options):
 
     if zephyr_dt:
         xlnx_generate_zephyr_domain_dts(tgt_node, sdt, options)
+        zephyr_supported_schema_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "zephyr_supported_comp.yaml")
+        if utils.is_file(zephyr_supported_schema_file):
+            match_cpunode = get_cpu_node(sdt, options)
+            schema = utils.load_yaml(zephyr_supported_schema_file)
+            proplist = schema["amd,mbv32"]["required"]
+            delete_unused_props( match_cpunode, proplist, False)
+            match_cpunode.parent.name = "cpus"
     return True
 
 def xlnx_generate_zephyr_domain_dts(tgt_node, sdt, options):
@@ -489,7 +496,6 @@ def xlnx_generate_zephyr_domain_dts(tgt_node, sdt, options):
 
     match_cpunode = get_cpu_node(sdt, options)
     match_cpunode.parent.delete("address-map")
-    match_cpunode.parent.name = match_cpunode.parent.name.split('@')[0]
     for node in root_sub_nodes:
 
         soc_kconfig_file = os.path.join(sdt.outdir, "Kconfig")
@@ -503,6 +509,7 @@ def xlnx_generate_zephyr_domain_dts(tgt_node, sdt, options):
                 dev_node = var.split(':')[0]
 
                 sdt.tree[node]['zephyr,console'] = dev_node
+                sdt.tree[node]['zephyr,shell-uart'] = dev_node
 
         if node.name == "amba_pl":
                 sdt.tree.delete(node)

diff --git a/lopper/assists/zephyr_supported_comp.yaml b/lopper/assists/zephyr_supported_comp.yaml
@@ -4,8 +4,6 @@ amd,mbv32:
     - reg
     - device_type
     - riscv,isa
-    - i-cache-size
-    - d-cache-size
     - clock-frequency
 
 xlnx,xps-intc-1.00.a:

diff --git a/lopper/lops/lop-mbv-zephyr-intc.dts b/lopper/lops/lop-mbv-zephyr-intc.dts
@@ -47,7 +47,7 @@
 		lop_3 {
                         compatible = "system-device-tree-v1,lop,select-v1";
                         select_1;
-                        select_2 = "/cpus_.*:compatible:cpus,cluster";
+                        select_2 = "/cpus*:compatible:cpus,cluster";
 			lop_3_1 {
                         	compatible = "system-device-tree-v1,lop,modify";
                         	modify = ":compatible:";