Author: myles
Date: 2008-12-19 03:40:54 +0100 (Fri, 19 Dec 2008)
New Revision: 1079

Modified:
   coreboot-v3/util/dtc/flattree.c
Log:
This patch removes the logic for multiple links.  It would put siblings that
were bridges as separate links.  There isn't a board in v3 that needs multiple
links yet.

Signed-off-by: Myles Watson <[email protected]>
Acked-by: Marc Jones <[email protected]>


Modified: coreboot-v3/util/dtc/flattree.c
===================================================================
--- coreboot-v3/util/dtc/flattree.c     2008-12-18 02:00:55 UTC (rev 1078)
+++ coreboot-v3/util/dtc/flattree.c     2008-12-19 02:40:54 UTC (rev 1079)
@@ -703,7 +703,7 @@
         * There is a good chance we could expand the for loop to contain this 
first bit of code. 
         * OTOH, the compiler can do it for us, and the initial conditions are 
clearer this way.
         */
-       if ((! tree->linked) && is_bridge(tree)){
+       if (is_bridge(tree)){
                struct node *siblings; 
                fprintf(f,"\t.link = {\n");
                fprintf(f,"\t\t[%d] = {\n", linkcount);
@@ -714,24 +714,6 @@
                fprintf(f,"\t\t},\n");
                /* now we need to handle our siblings. */
                linkcount++;
-               for_all_siblings(tree, siblings) {
-                       if (is_bridge(siblings) && (!siblings->linked)){
-                               fprintf(f,"\t\t[%d] = {\n", linkcount);
-                               fprintf(f,"\t\t\t.dev = &dev_%s,\n", 
siblings->label);
-                               fprintf(f,"\t\t\t.link = %d,\n", linkcount);
-                               if (siblings->children) {
-                                       fprintf(f,"\t\t\t.children = 
&dev_%s\n", siblings->children->label);
-                                       siblings->children->linked = 1;
-                                       siblings->children->linknode = tree;
-                                       siblings->children->whichlink = 
linkcount;
-                               }
-                               fprintf(f,"\t\t},\n");
-                               siblings->linked = 1;
-                               siblings->whichlink = linkcount;
-                               siblings->linknode = tree;
-                               linkcount++;
-                       }
-               }
                fprintf(f,"\t},\n");
        }
        fprintf(f,"\t.links = %d,\n", linkcount);


--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to