From 5227098e16c11b1b3c70b93ba0b501c81a06cab8 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Fri, 19 Dec 2008 02:40:54 +0000 Subject: [PATCH] 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 Acked-by: Marc Jones git-svn-id: svn://coreboot.org/repository/coreboot-v3@1079 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- util/dtc/flattree.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/util/dtc/flattree.c b/util/dtc/flattree.c index d1d1afd679..7ebfc6b389 100644 --- a/util/dtc/flattree.c +++ b/util/dtc/flattree.c @@ -703,7 +703,7 @@ static void coreboot_emit_special(FILE *e, struct node *tree) * 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 @@ static void coreboot_emit_special(FILE *e, struct node *tree) 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);