openamp: xlnx: clean up timer trimming

in linux case - keep UIO if present. thats it.
else (non linux cases) just make sure all extent timers have the correct
compatible

Signed-off-by: Ben Levinsky <ben.levinsky@amd.com>

Author: bentheredonethat

lopper/assists/openamp_xlnx.py

@@ -121,34 +121,32 @@ def xlnx_openamp_trim_timers(sdt, target_os, machine):
         match_cpunode = get_cpu_node(sdt, {'args':[machine]})
         domains = [ n for n in tree["/domains"].subnodes(children_only=True) if match_cpunode.parent == sdt.tree.pnode(n.parent.parent.propval("cpus")[0]) ]
 
-    if not domains:
-        return False
-
     timer_pvals = [ n.propval("timer") for n in domains[0].subnodes(children_only=True) if n.propval("timer") != [''] ]
 
     # only do trim if timer prop is provided
-    if not timer_pvals:
+    if timer_pvals == []:
         return False
 
-    flattend_timer_pvals = [item for sublist in timer_pvals for item in sublist]
-    relevant_timer_nodes = [ tree.pnode(phandle) for phandle in flattend_timer_pvals ]
-
-    # enable UIO timers
-    for i in relevant_timer_nodes:
-        if "uio" in i.propval("compatible"):
-            i['status'] = 'okay'
-
-    all_timer_nodes = [ n for n in tree["/axi"].subnodes(children_only=True, name="timer@*") if n.propval("compatible") == ["cdns,ttc"] ]
-
     # remove UIO timers from stripping
     if target_os == "linux_dt":
-        all_timer_nodes = [
-            timer_node for timer_node in all_timer_nodes
-            if "uio" not in timer_node.propval("compatible")
-        ]
+        flattend_timer_pvals = [item for sublist in timer_pvals for item in sublist]
+        relevant_timer_nodes = [ tree.pnode(phandle) for phandle in flattend_timer_pvals ]
+
+        for node in tree["/axi"].subnodes(children_only=True, name="timer@*"):
+            if node not in relevant_timer_nodes:
+                tree.delete(node)
+            if "uio" in node.propval("compatible"):
+                node["status"] = "okay"
+
+        return True
 
-    # delete irrelevant timer nodes
-    [ tree.delete(timer_node) for timer_node in all_timer_nodes if timer_node not in relevant_timer_nodes ]
+    # baremetal / freertos / zephyr case
+    # in freertos and baremetal case - dont mess with UIO
+    # NOTE once sigils and conditional property usge is beefed up
+    # this whole routine can go away. Until then this is a holdover
+    # to ensure that UIO / linux is there if needed.
+    for n in tree["/axi"].subnodes(children_only=True, name="timer@*"):
+        n["compatible"] = "cdns,ttc"
 
     return True