Changeset 965dc18 in mainline for boot/genarch/ofw_tree.c

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

• boot/genarch/ofw_tree.c (modified) (2 diffs)

boot/genarch/ofw_tree.c

@@ -121 +121 @@
                 memcpy(current_node->da_name, &path[i], len);
                 current_node->da_name[len] = '\0';
-        
         
                 /*
@@ -220 +219 @@
 {
         ofw_tree_node_t *root;
+        phandle ssm_node;
+        ofw_tree_node_t *ssm;
         
         root = ofw_tree_node_alloc();
         if (root)
                 ofw_tree_node_process(root, NULL, ofw_root);
+
+        /*
+         * The firmware client interface does not automatically include the
+         * "ssm" node in the list of children of "/". A nasty yet working
+         * solution is to explicitly stick "ssm" to the OFW tree.
+         */
+        ssm_node = ofw_find_device("/ssm@0,0");
+        if (ssm_node != -1) {
+                ssm = ofw_tree_node_alloc();
+                if (ssm) {
+                        ofw_tree_node_process(
+                                ssm, root, ofw_find_device("/ssm@0,0"));
+                        ssm->peer = root->child;
+                        root->child = ssm;
+                }
+        }
         
         return root;